40386c8f05
Merge pull request #1644 from pi-hole/sanity-check-downloaded-FTL
...
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Add some hardening to the build script
2024-11-22 18:37:36 +01:00
eb8b5af7dc
Merge pull request #1659 from pi-hole/dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-5
...
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Bump Chizkiyahu/delete-untagged-ghcr-action from 4 to 5
2024-11-16 12:29:07 +01:00
7e0c93b03a
Bump Chizkiyahu/delete-untagged-ghcr-action from 4 to 5
...
Bumps [Chizkiyahu/delete-untagged-ghcr-action](https://github.com/chizkiyahu/delete-untagged-ghcr-action ) from 4 to 5.
- [Release notes](https://github.com/chizkiyahu/delete-untagged-ghcr-action/releases )
- [Commits](https://github.com/chizkiyahu/delete-untagged-ghcr-action/compare/v4...v5 )
---
updated-dependencies:
- dependency-name: Chizkiyahu/delete-untagged-ghcr-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-11-16 10:23:23 +00:00
4e1a66a757
Merge pull request #1646 from pi-hole/tweak/README_v6
...
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Tweak README text and formatting
2024-11-09 19:45:22 -03:00
8faa60a1ca
Update README.md
...
Check for merge conflicts / main (push) Has been cancelled
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br >
Signed-off-by: Adam Warner <github@adamwarner.co.uk >
2024-11-03 15:56:59 +00:00
be8e292318
Improve BREAKING CHANGES text
...
Check for merge conflicts / main (push) Has been cancelled
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2024-10-28 16:07:00 -03:00
f755a0220c
Add a few punctuation marks and remove trailing spaces.
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2024-10-28 16:03:30 -03:00
3470a39e17
Merge pull request #1652 from pi-hole/dependabot/pip/test/development/black-24.10.0
...
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Bump black from 24.8.0 to 24.10.0 in /test
2024-10-12 16:17:15 +02:00
8f376ea23e
Bump black from 24.8.0 to 24.10.0 in /test
...
Bumps [black](https://github.com/psf/black ) from 24.8.0 to 24.10.0.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/24.8.0...24.10.0 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-10-12 10:53:39 +00:00
e5277ce1b4
Merge pull request #1651 from pi-hole/tini-not-needed
...
Build Image and Publish / build (3.19, linux/386) (push) Waiting to run
Build Image and Publish / build (3.19, linux/amd64) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm/v6) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm/v7) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm64) (push) Waiting to run
Build Image and Publish / build (edge, linux/riscv64) (push) Waiting to run
Build Image and Publish / merge-and-deploy (push) Blocked by required conditions
Check for merge conflicts / main (push) Waiting to run
Remove tini from image, we don't need it as we're handling all the ex…
2024-10-11 18:48:56 +01:00
a070b944c4
Remove tini from image, we don't need it as we're handling all the exits etc in start.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-10-11 18:14:46 +01:00
d762e9140c
Merge pull request #1649 from pi-hole/terminate-with-FTL
...
Build Image and Publish / build (3.19, linux/386) (push) Waiting to run
Build Image and Publish / build (3.19, linux/amd64) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm/v6) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm/v7) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm64) (push) Waiting to run
Build Image and Publish / build (edge, linux/riscv64) (push) Waiting to run
Build Image and Publish / merge-and-deploy (push) Blocked by required conditions
Check for merge conflicts / main (push) Waiting to run
Always terminate the container if pihole-FTL binary exits
2024-10-10 21:18:54 +01:00
add6973a28
Monitor the capsh pid, not FTL pid. If stop is called without an exit code being passed to it, then FTL is still running - so we stop FTL and then get the exit code from the capsh PID by immediately waiting it after killing FTL
...
Check for merge conflicts / main (push) Has been cancelled
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-10-09 21:56:57 +01:00
f9b6999da1
Update src/start.sh
...
Check for merge conflicts / main (push) Waiting to run
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br >
Signed-off-by: Adam Warner <github@adamwarner.co.uk >
2024-10-07 23:10:23 +01:00
9e37aa8f59
Clean up the code - at the end of the start() function, wait for the start_ftl process and pass it's exit code to stop.
...
Add in additional while/wait to ensure that after the FTL log exists, it contains the "FTL Started" line
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-10-07 21:54:55 +01:00
210a1172ff
Always terminate the container if pihole-FTL binary exits. Either naturally or via an error. Don't attempt to restart it, allow the container's restart policy to do this.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-10-06 22:49:19 +01:00
ba5d35dfae
Merge branch 'development' into tweak/README_v6
...
Check for merge conflicts / main (push) Has been cancelled
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2024-09-25 13:26:28 -03:00
89eb7f6b0d
Correct the documentation for the TAIL_FTL_LOG variable
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
2024-09-25 15:28:01 +01:00
5f3b829dc5
Merge pull request #1648 from pi-hole/dependabot/pip/test/development/pytest-8.3.3
...
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Bump pytest from 8.3.2 to 8.3.3 in /test
2024-09-14 12:52:36 +02:00
3070e68ca8
Bump pytest from 8.3.2 to 8.3.3 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 8.3.2 to 8.3.3.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/8.3.2...8.3.3 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-09-14 10:50:57 +00:00
c020a70d0c
Merge pull request #1647 from IngmarStein/patch-1
...
Build Image and Publish / build (3.19, linux/386) (push) Waiting to run
Build Image and Publish / build (3.19, linux/amd64) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm/v6) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm/v7) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm64) (push) Waiting to run
Build Image and Publish / build (edge, linux/riscv64) (push) Waiting to run
Build Image and Publish / merge-and-deploy (push) Blocked by required conditions
Check for merge conflicts / main (push) Waiting to run
Update README.md
2024-09-14 09:55:52 +02:00
39f5df9866
Update README.md
...
Add a missing word in the description of the `TAIL_FTL_LOG` variable.
Signed-off-by: Ingmar Stein <IngmarStein@users.noreply.github.com >
2024-09-14 09:49:48 +02:00
a780403fa5
Tweak Readme text and formatting
...
mainly format changes, removal of trailing spaces, addition or removal
of line breaks and some text corrections
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2024-09-13 16:29:42 -03:00
ca7637decd
Use the same logo and header used in web repo
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2024-09-13 16:04:04 -03:00
17279be549
Use a better format for the "BREAKING CHANGES" alert
...
and set the new version number to v6
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br >
2024-09-13 16:02:36 -03:00
563179499c
Add some hardening to the build script. Check if system has docker buildx installed. When using custom branches, check they actuall exist before proceeding with the build
...
Check for merge conflicts / main (push) Has been cancelled
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-13 18:43:51 +01:00
4c058620bf
Merge pull request #1645 from pi-hole/fix-tests
...
Build Image and Publish / build (3.19, linux/386) (push) Waiting to run
Build Image and Publish / build (3.19, linux/amd64) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm/v6) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm/v7) (push) Waiting to run
Build Image and Publish / build (3.19, linux/arm64) (push) Waiting to run
Build Image and Publish / build (edge, linux/riscv64) (push) Waiting to run
Build Image and Publish / merge-and-deploy (push) Blocked by required conditions
Check for merge conflicts / main (push) Waiting to run
Fix development tests
2024-09-13 18:43:17 +01:00
af8863a156
Clean Shutdown test: Remove check for the "Shutting down..." line in FTL log as this is now only printed when debug logging is on
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-13 18:36:47 +01:00
3454f65bb3
Merge pull request #1643 from pi-hole/sanity-check-downloaded-FTL
...
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Confirm validity of downloaded FTL binary when building
2024-09-11 21:11:17 +01:00
e938d1a39b
Actually do something with the result of readelf in case of invalid FTL binary
...
Remove the `cat` of the pihole-FTL binary as it could lead to a very difficult to read logs
Add some more helpful output to the build script
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-11 19:09:35 +01:00
2823d1d1ce
Merge pull request #1641 from pi-hole/migrage-dnsmasq-conf
...
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Check for merge conflicts / main (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Migrate old Pi-hole owned dnsmasq config files into /etc/pihole/migration_backup_v6
2024-09-06 15:51:20 +01:00
df97235946
Migrate the dnsmasq.d configs that are owned by Pi-hole into /etc/pihole/migration_backup_v6, where FTL expects to find them
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-05 19:30:01 +01:00
a5d4e0727f
Merge pull request #1639 from pi-hole/master
...
Sync master back into development
2024-09-02 22:42:48 +01:00
f9d305635d
Merge branch 'development' into master
Check for merge conflicts / main (push) Has been cancelled
Sync Back to Development / Syncing branches (push) Has been cancelled
2024-09-02 22:42:38 +01:00
15085ce33e
Merge pull request #1635 from pi-hole/dependabot/pip/test/development/pytest-xdist-3.6.1
...
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
2024-09-02 23:31:05 +02:00
8a2c70e961
Bump pytest-xdist from 3.5.0 to 3.6.1 in /test
...
Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist ) from 3.5.0 to 3.6.1.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases )
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.5.0...v3.6.1 )
---
updated-dependencies:
- dependency-name: pytest-xdist
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-09-02 21:30:03 +00:00
1ae858253a
Merge pull request #1637 from pi-hole/dependabot/pip/test/development/pytest-8.3.2
...
Bump pytest from 7.4 to 8.3.2 in /test
2024-09-02 23:29:07 +02:00
1a77fbdb81
Bump pytest from 7.4 to 8.3.2 in /test
...
Bumps [pytest](https://github.com/pytest-dev/pytest ) from 7.4 to 8.3.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases )
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest/compare/7.4.0...8.3.2 )
---
updated-dependencies:
- dependency-name: pytest
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-09-02 21:26:11 +00:00
98eb89d107
Merge pull request #1638 from pi-hole/dependabot/pip/test/development/pytest-testinfra-10.1.1
...
Bump pytest-testinfra from 10.0.0 to 10.1.1 in /test
2024-09-02 23:25:24 +02:00
adc64d0db5
Bump pytest-testinfra from 10.0.0 to 10.1.1 in /test
...
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra ) from 10.0.0 to 10.1.1.
- [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases )
- [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/pytest-dev/pytest-testinfra/compare/10.0.0...10.1.1 )
---
updated-dependencies:
- dependency-name: pytest-testinfra
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-09-02 21:23:36 +00:00
a9a9a9a6ff
Merge pull request #1636 from pi-hole/dependabot/pip/test/development/black-24.8.0
...
Bump black from 23.12.0 to 24.8.0 in /test
2024-09-02 23:22:49 +02:00
a796a89d61
Merge branch 'development' into master
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-02 22:19:00 +01:00
4cb3c3a16d
Update branch name in sync-back-to-dev workflow
...
Check for merge conflicts / main (push) Has been cancelled
Sync Back to Development / Syncing branches (push) Has been cancelled
Build Image and Publish / build (3.19, linux/386) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/amd64) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v6) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm/v7) (push) Has been cancelled
Build Image and Publish / build (3.19, linux/arm64) (push) Has been cancelled
Build Image and Publish / build (edge, linux/riscv64) (push) Has been cancelled
Mark stale issues / stale_action (push) Has been cancelled
Mark stale issues / remove_stale (push) Has been cancelled
Close stale PR / stale (push) Has been cancelled
Build Image and Publish / merge-and-deploy (push) Has been cancelled
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-02 22:18:02 +01:00
34f6116c83
Bump black from 23.12.0 to 24.8.0 in /test
...
Bumps [black](https://github.com/psf/black ) from 23.12.0 to 24.8.0.
- [Release notes](https://github.com/psf/black/releases )
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md )
- [Commits](https://github.com/psf/black/compare/23.12.0...24.8.0 )
---
updated-dependencies:
- dependency-name: black
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-09-02 21:16:07 +00:00
f96fddda41
Merge pull request #1633 from pi-hole/sort-master-scheduled-build
...
[Housekeeping] Bring build script across from development
2024-09-02 22:15:38 +01:00
bd54136d08
update dependabot.yml to run against development not dev - remove v6 references
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-02 22:09:55 +01:00
fa5344e16c
remove old build scripts from master (we wont use them again) and bring accross the v6 one so that the nightly image is built using the correct branches
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-02 22:05:41 +01:00
c38a6ea487
Merge pull request #1626 from pi-hole/development-v6
...
Development v6 -> dev
2024-09-02 21:59:46 +01:00
d00f17f169
Merge pull request #1632 from pi-hole/build-scripts-once-v6-in-dev
...
Final changes for merge to `development`
2024-09-02 21:57:57 +01:00
9e39ed34e0
Disbale arm64 testing for the time being
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2024-09-02 21:55:43 +01:00
Dominik
yubiuser
dependabot[bot]
RD WebDesign
Adam Warner
Ingmar Stein