b0a5a0f163
Trailing slashes on volumes fail on newer versions of docker-compose ( #949 )
...
* Trailing slashes on volumes fail on newer versions of docker-compose
See [Issue 947](https://github.com/pi-hole/docker-pi-hole/issues/947 )
for the background.
This PR proposes removing trailing slashes from all documentation,
examples and scripts.
Signed-off-by: Phill Kelley <pmk.57t49@lgosys.com>
2021-12-11 13:37:18 +00:00
523762e47d
scream test: removing linux/ppc64le as there are build errors - unsure if anyone is _actually_ using this in any case. I guess we'll find out...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-12-11 00:21:51 +00:00
7848d06325
Switch base from `debian:buster-slim` to `ghcr.io/pi-hole/docker-pi-hole-base:buster-slim`, which is updated weekly and should speed up build times on this end
2021-12-11 00:20:04 +00:00
54ca7e9ce4
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into dev
2021-12-10 20:51:51 +00:00
9a9ee41a45
- Replace PIHOLE_VERSION with PIHOLE_DOCKER_TAG
...
- reorder some stuff in the main Dockerfile
- Remove the CORE/WEB/FTL_VERSION args/env vars
- tweaks to GHA build script after some hints from @crazy-max
- always checkout dev versions of Pi-hole for nightly build, also make sure we're using dev branch of this repo
- keep pihole checkout enabled for dev and nightly tags
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-12-10 20:51:35 +00:00
f70a4f4022
Update Dockerfile to use COPY instead of ADD as recommended on https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#add-or-copy ( #946 )
...
Signed-off-by: TheDen <deniskhoshaba@gmail.com>
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
2021-12-09 19:30:13 +00:00
7049b5df03
remove references to porrt 443
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-12-09 17:09:36 +00:00
4aaf0998a3
Customize pihole-FTL.conf with FTLCONF_ prefixed environment variables. ( #944 )
...
* Customize pihole-FTL.conf with FTLCONF_ prefixed environment variables.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
* Reintroduced parsing of ServerIP* env vars and amended README for deprecated variables.
Signed-off-by: Alexandre Ratte <alexandre.ratte@gmail.com>
2021-11-26 16:58:10 +00:00
27bdf81665
Combine nightly and main workflows into one. Tested functionality on a fork so this can come straight into dev
...
use dev images for the dev branch build.
Only disable pihole checkout on released tags - allow it in dev and nightly tags
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-11-17 23:42:49 +00:00
ff776c2ba4
[skip ci] Fixed link to reverse proxy ( #939 )
...
The example seems to no longer be using jwilder/nginx-proxy but the very similar nginxproxy/nginx-proxy. Additionally the link to the example was broken.
2021-10-31 14:41:55 +00:00
e874dc1f3e
Publish images to GHCR alongside DockerHub ( #940 )
...
Signed-off-by: Fernando Fernández <ferferga@hotmail.com>
2021-10-31 14:39:56 +00:00
c0d05f291d
Add PIHOLE_VERSION as PIHOLE_DOCKER_TAG in the php environment instead of injecting the version into the admin page's footer ( #930 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-10-23 16:32:14 +01:00
a39726d183
remove reference to pihole/debian-base, replace with debian:{buster}-slim
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-10-09 18:48:17 +01:00
5ed8b8ec7b
Merge pull request #928 from pi-hole/fix/docker-namespace
...
* Use the namespace from secrets so others can build too.
* Add DOCKERHUB_NAMESPACE variable.
* Use hub namepace in all actions.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-10-03 22:21:47 +01:00
aefeb2bc8d
Use hub namepace in all actions.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-10-03 14:15:30 -07:00
4782f15123
Add DOCKERHUB_NAMESPACE variable.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-10-03 13:41:31 -07:00
73a335533b
Use the namespace from secrets so others can build too.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-10-03 10:00:00 -07:00
d036e0d0c0
Merge branch 'dev'
2021-09-29 22:58:07 +01:00
3696f6065f
Actually not needed as you can already choose to run it against whatever branch.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-16 20:58:35 +01:00
9740d2b86a
Add option to run build against another branch to workflow_dispatch
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-16 20:54:42 +01:00
1b6318c0d9
Merge branch 'dev'
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-15 18:34:33 +01:00
c371768800
And ppc64le - It might work, it might not. Someone will tell us if it doesn't.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-15 18:32:38 +01:00
bc545b6049
Add `linux/arm/v6` to `platforms:`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-15 18:28:09 +01:00
3942d9a740
Repalce PIHOLE_TAG with PIHOLE_VERSION, it isn't actually needed after all.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 23:43:59 +01:00
944bc8eb79
use metadata-action to handle image tag names
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 23:27:06 +01:00
55a682a94c
Use the correct namespace to upload the images...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 22:53:38 +01:00
7624fc3d56
Reduce Test step to only one arch (amd64/buster)
...
Migrate build and push step to native github actions using docker buildX - which should _hopefully_ resolve #735
Make some adjustments to Dockerfile/build.yml/install.sh to allow both gh-actions-test.sh to build using the test suite, and github actions native commands to build online
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 22:34:24 +01:00
9b106e6275
[skip ci] Maybe don't push the individual arch images. Test
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 18:03:53 +01:00
17453166c2
[skip ci] I read the docs for actions/checkout wrong
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 17:09:47 +01:00
521bed1c4f
No need to build `stretch` images as well as `buster`
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 17:03:13 +01:00
1cc3159518
update workflows to use env vars instead of patching VERSIONS file
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 16:53:17 +01:00
ca69e29514
Always install lastest released Pi-hole unless otherwise indicated by environment variables CORE_VERSION/WEB_VERSION/FTL_VERSION
...
This is closer to mimicking the installation of Pi-hole on bare metal, and also shaves about 40MB off of the size of a container not using custom branches.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 16:46:19 +01:00
b553462c95
Merge pull request #921 from pi-hole/tweak/imageversions
...
Untangle FTL Version from image building
2021-09-12 15:42:06 +01:00
155d87f8c1
add a skip directive to `test_volume_shell_script`, as I can't work out how to fix it just yet...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 14:24:50 +01:00
6cec6f937f
Bring GIT_TAG into the build environment for use as PIHOLE_VERSION in the container.
...
Remove the `pihole/pihole:` part of the PIHOLE_TAG in the python script (see #920 )
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 14:16:45 +01:00
1a7bfdc2ee
[skip ci] remove tag trigger, add release trigger
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-11 23:30:26 +01:00
d84851c7a3
[skip ci] wildcard tags filter?
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-11 23:05:54 +01:00
f0f96ee1ab
[skip ci] Remove nightly beta build
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-11 22:55:56 +01:00
9a800f7efd
Update VERSIONS
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-11 22:28:41 +01:00
52b21c6ef6
remove a bunch of filters for the branch builds. No sense in building `master`, and the other patterns are rarely actually used.
...
Remove the v* filter from tag to support proposed new tag versioning format (no v up the front end)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-11 18:58:46 +01:00
0cceed3c83
Merge branch 'master' into dev
2021-09-06 22:43:22 +01:00
300fcf0c9e
Merge pull request #916 from pi-hole/fix/capabilities
...
Add CAP_SYS_NICE, CAP_IPC_LOCK, CAP_CHOWN capabilites recommendation
2021-09-06 23:24:24 +02:00
ec3b4609bc
Add CAP_SYS_NICE, CAP_IPC_LOCK, CAP_CHOWN capabilites recommendation
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2021-09-06 22:33:09 +02:00
22ce49a123
Update nightly-build beta-v5.9.yml
2021-09-01 16:47:17 +01:00
d821dcb2f0
Merge pull request #899 from majabojarska/fix_readme_typos
...
Fix README.md typos: "Descrption"
2021-08-26 09:33:43 +01:00
ef54216986
Merge pull request #897 from pi-hole/feature/dependabot-actions
...
Dependabot manage GHA versions.
2021-08-26 09:32:38 +01:00
93092da023
Merge branch 'master' into feature/dependabot-actions
2021-08-25 14:22:58 -07:00
3153346ec8
Merge pull request #905 from shaderecker/dev
...
Improve Docker Healthcheck: Shorten dig output
2021-08-22 22:45:41 +01:00
ee6e1b36a9
Healthcheck: Shorten dig output
...
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
2021-08-22 22:04:36 +02:00
73ad23b3b6
Merge branch 'dev'
2021-08-21 13:48:32 +01:00
Phill
Adam Warner
Denis Khoshaba
AlexandreRatte
moritzbeck01
Fernando Fernández
Dan Schaper
DL6ER
DL6ER
Sebastian Haderecker