99350c2327
Enable colors for pytest output. This certainly works locally, not sure if it will work on GHA... One way to find out.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-06 18:57:45 +00:00
b723874623
Don't need to see all the images on the system
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-06 18:57:09 +00:00
67d00f3b38
Merge pull request #1267 from pi-hole/master
...
Sync master back into development
2023-01-03 19:46:50 +00:00
203f6f4ea3
Merge pull request #1260 from yubiuser/be_honest
...
Shorten no merge conflict message
2023-01-02 19:04:25 +00:00
7eab50ce29
Merge pull request #1259 from pi-hole/master
...
Sync master back into development
2023-01-02 19:03:31 +00:00
3fe6b9e750
Add a clarifyier to docker compose command, remove the -f, as it is not needed
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2023-01-02 19:00:41 +00:00
3eb38a297e
Merge pull request #1262 from pi-hole/dependabot/github_actions/dev/actions/stale-7
...
Bump actions/stale from 6 to 7
2022-12-27 12:27:45 +00:00
62e3af4e60
Bump actions/stale from 6 to 7
...
Bumps [actions/stale](https://github.com/actions/stale ) from 6 to 7.
- [Release notes](https://github.com/actions/stale/releases )
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/stale/compare/v6...v7 )
---
updated-dependencies:
- dependency-name: actions/stale
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-12-24 10:00:34 +00:00
a4b5122e3e
Shorten no merge conflict message
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-22 22:29:09 +01:00
fa0fb82477
Merge pull request #1258 from pi-hole/dev
...
Dev -> master
2022-12-21 21:43:05 +00:00
842f4eb6c2
Merge pull request #1255 from yubiuser/merge_conflict
...
Add merge conflict workflow
2022-12-19 20:48:52 +00:00
d52df6dfb2
Merge pull request #1256 from pi-hole/master
...
Sync master back into development
2022-12-15 22:34:41 +00:00
6566662bc3
Merge pull request #1254 from yubiuser/sync_back
...
Use github cli to sync master back to development
2022-12-15 21:10:50 +00:00
e734f1fbce
Add merge conflict workflow
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-15 21:54:27 +01:00
6ed70c21a0
Use github cli to sync master back to development
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-12-15 21:46:58 +01:00
ae4271e80d
Merge pull request #1105 from pi-hole/ADD_PADD
...
Bake latest release (at time of build) of PADD into the container
2022-12-11 16:18:54 +00:00
f20a0d448c
Add to /usr/local/bin and drop the .sh. Can now be called with `padd`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 16:16:29 +00:00
806829a1b1
add padd to .codespellignore.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 15:51:43 +00:00
fbef9727c1
Update Dockerfile
...
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2022-12-11 15:47:26 +00:00
201303a56a
ADD padd.sh to the container root
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-12-11 15:47:26 +00:00
1fe6506e4f
Merge pull request #1247 from pi-hole/tweak/ftlrun
...
Remove unneeded variable reference in FTL run script
2022-12-10 16:48:15 +00:00
2affe3c9cf
Merge pull request #1250 from pi-hole/PromoFaux-patch-1
...
Update README to explain the version numbers slightly more accurately
2022-12-10 16:47:25 +00:00
ad36316060
Merge branch 'dev' into PromoFaux-patch-1
2022-11-30 22:40:26 +00:00
41ac2b3aa8
Update README to explain the version numbers slightly more accurately
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-30 22:38:31 +00:00
a0421789cc
CAP_STR will always be empty, since 776bac7b moved the calculation of that variable back out to bash_functions.sh
...
The capabilities are already set there, so they do not need to be set again here.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-27 22:35:31 +00:00
7b80d7de66
Merge pull request #1246 from pi-hole/master
...
sync: master to dev
2022-11-27 21:48:26 +00:00
a787e29aad
Merge pull request #1245 from pi-hole/dev
...
Dev - > master
2022-11-27 21:46:10 +00:00
8aa6623844
Merge pull request #1242 from th0r88/patch-1
...
Added the right public port for pihole config
2022-11-21 07:12:18 +00:00
91a174f976
Added the right public port for pihole config
...
Otherwise it doesn't work.
Signed-off-by: Jan Ferme <10115360+th0r88@users.noreply.github.com>
2022-11-21 01:00:18 +01:00
41aa699aab
Merge pull request #1234 from pi-hole/updatechecktiming
...
Ensure FTL is running before attempting to run functions/lines that require DNS resolution to be working
2022-11-09 18:03:53 +00:00
f73c92d03b
rename _gravityonboot service/script to _postFTL and move updatecheck/version output to this script
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-11-09 17:51:07 +00:00
1f69a1ab83
Merge pull request #1232 from davidgatti/patch-1
...
Working docker compose command.
2022-11-08 12:17:02 +00:00
7f8862d73f
Added -d option for detach.
2022-11-05 14:39:27 +01:00
069a88b7d1
Update README.md
...
Added the working command for Docker 2
Signed-off-by: David Gatti <dawid@gatti.io>
2022-11-05 08:50:04 +01:00
b9f3aada94
Merge pull request #1225 from pi-hole/dev
...
Dev -> master before release
2022-10-10 22:02:18 +01:00
dc4071f9a4
Merge pull request #1219 from juliohurtado/patch-1
...
Delete duplicate "that"
2022-10-06 19:11:45 +01:00
1f3ced8d31
Merge branch 'dev' into patch-1
2022-10-06 16:23:47 +02:00
47fe743548
Delete duplicate "that"
...
Signed-off-by: Julio Hurtado Gómez <kloner88@gmail.com>
2022-10-04 10:14:30 +02:00
e4a7a11b88
Merge pull request #1216 from pi-hole/ftl-port-file-removal
...
Remove references to deprecated `pihole-FTL.port` file
2022-09-24 15:18:33 +01:00
658f6de774
FTL.port file is deprecated (see https://github.com/pi-hole/FTL/pull/1445 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-24 15:11:27 +01:00
fc8a679521
Merge pull request #1215 from pi-hole/dependabot/github_actions/dev/actions/stale-6
...
Bump actions/stale from 5 to 6
2022-09-24 13:10:02 +01:00
4f9b854546
Bump actions/stale from 5 to 6
...
Bumps [actions/stale](https://github.com/actions/stale ) from 5 to 6.
- [Release notes](https://github.com/actions/stale/releases )
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/stale/compare/v5...v6 )
---
updated-dependencies:
- dependency-name: actions/stale
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-09-24 10:06:36 +00:00
1eff43b6b7
Merge pull request #1214 from danitorregrosa/dev
...
S6_ARCH fix for rpi1
2022-09-22 22:19:31 +01:00
913f11beb5
S6_ARCH fix for rpi1
...
Resolves #1201
Signed-off-by: danitorregrosa <danitorregrosa@gmail.com>
2022-09-22 22:55:21 +02:00
71d77b5fe8
Merge pull request #1212 from pi-hole/refactor-some-more
...
Change some variables so that they cannot be overridden by users
2022-09-20 09:16:07 +01:00
f94fb54a18
Some of these should not be user overridable
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-09-19 21:46:46 +01:00
a9ecd4e7a2
Merge pull request #1210 from lightswitch05/feature/cleanup-tests-and-test-dependencies
...
Remove old test dependencies, updated ones still being used. Introduce Black formatter
2022-09-18 11:58:12 +01:00
4da66313f4
Remove old test dependencies, updated ones still being used. Introduce Black formatter
2022-09-17 04:28:01 +00:00
2164220c69
Merge pull request #1204 from willman42/dev
...
init commit of Pi-hole behind Caddy example
2022-09-14 21:39:00 +01:00
798c0e606f
init commit of Pi-hole behind Caddy example
...
- Single docker compose file to spin up a Caddy and a Pi-hole container
- I put plenty of comments in compose file for user ref. Looks kinda
messy but I figured the more info the better and they can cull out
what they dont need.
- DHCP server is disabled by default in Pi-hole so I disabled the port
binding and NET_ADMIN capability by default as well, with brief
instructions and refs included.
- Caddy docker compose example ref: https://hub.docker.com/_/caddy
- Pi-hole Caddy config ref: https://docs.pi-hole.net/guides/webserver/caddy/
Signed-off-by: William Trelawny <william@trelawny.family>
2022-09-05 09:57:54 -04:00
Adam Warner
dependabot[bot]
Christian König
Jan Ferme
David Gatti
Julio Hurtado Gómez
danitorregrosa
Daniel
William Trelawny