57957574d2
Bump docker/metadata-action from 4 to 5
...
Bumps [docker/metadata-action](https://github.com/docker/metadata-action ) from 4 to 5.
- [Release notes](https://github.com/docker/metadata-action/releases )
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md )
- [Commits](https://github.com/docker/metadata-action/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: docker/metadata-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 13:28:14 +00:00
2e957f1e6f
Merge pull request #1434 from pi-hole/dependabot/github_actions/development-v6/docker/build-push-action-5
...
Bump docker/build-push-action from 4 to 5
2023-09-16 15:27:34 +02:00
71b8d50c55
Bump docker/build-push-action from 4 to 5
...
Bumps [docker/build-push-action](https://github.com/docker/build-push-action ) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases )
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 13:21:39 +00:00
c7bbc39909
Merge pull request #1436 from pi-hole/dependabot/github_actions/development-v6/docker/setup-buildx-action-3
...
Bump docker/setup-buildx-action from 2 to 3
2023-09-16 15:21:02 +02:00
e4a46df21a
Bump docker/setup-buildx-action from 2 to 3
...
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action ) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases )
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 13:16:45 +00:00
3fc1d87ef7
Merge pull request #1437 from pi-hole/dependabot/github_actions/development-v6/docker/setup-qemu-action-3
...
Bump docker/setup-qemu-action from 2 to 3
2023-09-16 15:16:04 +02:00
aa44c5a44b
Bump docker/setup-qemu-action from 2 to 3
...
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action ) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases )
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3 )
---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-16 10:35:24 +00:00
429739d060
Merge pull request #1427 from pi-hole/dependabot/github_actions/development-v6/actions/checkout-4
...
Bump actions/checkout from 3 to 4
2023-09-09 17:45:46 +02:00
9ee27ed2f8
Bump actions/checkout from 3 to 4
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-09-09 10:09:31 +00:00
9c46f8b9ba
Merge pull request #1406 from pi-hole/v6/even-tinier
...
Ensure pihole-FTL process is shut down cleanly on container exit / add tini
2023-09-03 12:43:05 +01:00
7e4de03a1f
add EUPL license
...
I copied this file from https://github.com/pi-hole/pi-hole
2023-09-03 12:37:22 +01:00
374f6f2537
Add in a test to kill start.sh and then ensure that pihole-FTL is gracefully exited.
...
We add in some sleeps to ensure that the log file is being written to before we check it
Log entry tests are based on many different passes of running this locally with all sorts of timeouts and sleeps, this seems to be the most consistent
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 23:31:39 +01:00
b41d50b94f
Remove volume mount from tests, this causes issues with gravity not being able to read an adlist file symlinked to /dev/null
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 22:57:35 +01:00
696895fa59
Fix some broken logic in the gravity skip code (I should have read it better)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 22:15:41 +01:00
94795db7e9
correct tini path
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 21:38:49 +01:00
3cebec9344
Add tini anyway (see `tini + bash 4.x at https://ahmet.im/blog/minimal-init-process-for-containers/ )
...
bash isn't going anywhere for the time being
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 21:20:12 +01:00
b674a8bde7
Who needs an init system anyway? Add a trap to ensure that pihole-FTL shuts down cleanly on container exit.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 21:20:11 +01:00
b56b8d03c4
black formatted some tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-08-09 21:18:10 +01:00
fa2eb0d2f5
Merge pull request #1402 from edgd1er/skigravityonboot
...
if skipgravityonboot set, check db version.
2023-08-09 19:47:04 +01:00
0748c7fc62
Update src/start.sh
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-08-09 19:46:48 +01:00
661bc42543
Merge pull request #1410 from pi-hole/padd/v6
...
Add PADD to the image
2023-08-02 23:02:59 +01:00
f24dd34e37
Update src/start.sh
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2023-08-02 23:00:00 +01:00
81e7671441
Revert alias and make branch configurable
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-02 22:20:20 +02:00
d89d826951
Add padd alias
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-08-01 21:29:30 +02:00
76b6d5bdb4
Add PADD to the image
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2023-07-31 23:38:39 +02:00
2c5f02df28
Merge pull request #1409 from pi-hole/v6/uninstall.sh
...
No need for uninstall.sh in the container image
2023-07-28 22:21:01 +01:00
e88985ba40
This is not needed!
...
Co-authored-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-28 21:58:48 +01:00
3c3563c289
Merge pull request #1408 from pi-hole/chore/alpine-alphebetize
...
Alphebetize alpine dependencies for organization.
2023-07-28 18:23:20 +01:00
9a058c5511
Alphebetize dependencies for organization.
2023-07-28 10:10:10 -07:00
fbaf191304
Merge pull request #1407 from Gontier-Julien/fix-procps
...
Tell alpine specifically to install/use procps-ng
2023-07-28 17:17:32 +01:00
dfdf5fa930
Tell alpine specifically to use procps-ng
...
Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
2023-07-28 17:17:51 +02:00
7cf55cb722
if skipgravityonboot set, check db version
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2023-07-27 03:24:55 +02:00
bfd8b1b380
Merge pull request #1404 from edgd1er/fix_uid_gid
...
[dev-v6]:extracted uid/gid functions need to be rewritten to remove the return
2023-07-26 22:03:25 +01:00
a2770a3f18
uid/gid: add info when already as expected
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2023-07-26 22:50:10 +02:00
2a8fa77adc
extracted functions need to be rewritten to remove the return
...
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2023-07-26 22:11:51 +02:00
e0678bd803
Merge pull request #1403 from pi-hole/v6/change-pihole-userid
...
Allow the for changing of the UID/GID of the user/group pihole
2023-07-26 17:37:59 +01:00
f09b0d68bb
Add tests for UID/GID switching
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-26 08:31:29 +01:00
62dd8d503c
Allow the for changing of the UID/GID of the user/group pihole
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-26 08:25:08 +01:00
6065425ba4
Merge pull request #1396 from pi-hole/v6/tests
...
Add tests back to the development-v6 container
2023-07-26 08:23:13 +01:00
fee259597c
`./build-and-test.sh enter` was not working because bash not installed, change command to sh instead of bash
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-24 18:47:47 +01:00
4c8f4613dd
test names should match the regular expression ^[a-z_][a-z0-9_]*$. Apparently
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-24 18:37:46 +01:00
1202dafcbd
Change test dockerfile base to `docker:24.0.4-cli-alpine3.18` rather than copying in, buildx would not work the other way.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-24 18:37:37 +01:00
3208c4042d
Strip out no longer relevant tests/test fixtures (persist_docker, for example has not been used in a long time) , begin building test library from ground up.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-24 18:11:33 +01:00
6b5332be47
- Change test dockerfile base to alpine, too (Alpine all the things!)
...
- Tweak build-and-test.sh to allow tests to run against more platforms using buildx
- Split GHA out into two seperate files. One for tests on pull requests, another for build and merge on push to `development-v6` (add other branches in later)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-24 18:11:33 +01:00
a317129a41
Merge pull request #1394 from pi-hole/v6/tzdata
...
Add tzdata package so that users can define their own timezone at runtime
2023-07-24 12:39:46 +01:00
93826e2d1d
Add tzdata package so that users can define their own timezone at runtime
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-07-24 00:12:46 +01:00
a92679868d
Merge pull request #1393 from edgd1er/Dockerfile_changes
...
fix arm64 arch. use copy --chmod. reduce number of layers.
2023-07-24 00:10:39 +01:00
45bbb490d0
Update src/Dockerfile
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: edgd1er <edgd1er@hotmail.com>
2023-07-24 00:43:21 +02:00
926b3ae8c6
fix arm64 arch. use copy --chmod
2023-07-24 00:39:02 +02:00
4471863464
Merge pull request #1395 from pi-hole/v6/docker_tag
...
re-add the PIHOLE_DOCKER_TAG build arg that went missing along the way
2023-07-23 23:30:30 +01:00
dependabot[bot]
yubiuser
Adam Warner
Adam Monsen
Adam Warner
Dan Schaper
Gontier Julien
edgd1er