Phill
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
Adam Warner
918e6b1a21
convert `/` to `-` in FTL_VERSION so that image name is valid
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-04 21:46:45 +01:00
Daniel
6b1765c638
Single pihole version file. Added 'python-dotenv' to parse for the VERSIONS file.
...
Signed-off-by: Daniel <daniel@developerdan.com>
2021-06-04 19:37:28 +00:00
jparenas
73378d1231
Add CUSTOM_CACHE_SIZE environment variable to the available options
...
Signed-off-by: jparenas <juan.p.arenas1@gmail.com>
2021-05-08 16:11:57 -05:00
static-void-main
6292fd1294
Add i386 arch
...
Signed-off-by: static-void-main <33235498+static-void-main@users.noreply.github.com>
2021-04-15 00:15:31 +02:00
Daniel
a779c7fc37
Make the default debian version buster, preserve the 'stretch' tag for those who need it.
...
Signed-off-by: Daniel <daniel@developerdan.com>
2020-09-28 17:12:03 -04:00
Daniel
752d83aeaa
Introduce additional docker tags for the debian version.
...
* Added new docker tag variations to specify the debian version ('stretch', and 'buster').
* Arch images are alway as specific as possible: pihole/pihole:master-amd64-stretch
* Multiarch images have both the specific debian version tags as well as the generic non-debian tags: pihole/pihole:master-stretch & pihole/pihole:master
* Currently, the non-specific tags point to the 'stretch' images. Eventaully it can be migrated to 'buster'.
* Use GitHub actions to do the builds. Although the script names include 'gh-actions' to differentiate them from the 'circle' scripts, there is zero logic that is specific to Github (ie. no Github environment variables).
* 'armhf:buster' & 'arm64:buster' has an issue with `ip route get`. I think the issue is related to 'qemu', but I'm not sure. Update the `validate_env` function to only use `ip route get` if `nc` reports something strange.
Signed-off-by: Daniel <daniel@developerdan.com>
2020-06-29 09:34:19 -04:00
Adam Hill
3b8227c29d
Make image a parameter to allow running with any image
2020-06-03 08:34:28 -05:00
Adam Hill
022b039718
added remove + recreate container test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-06-02 12:27:09 -05:00
Adam Hill
765eccea22
Merge branch 'dev' of github.com:diginc/docker-pi-hole into new_volume_test_base
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-06-02 08:21:48 -05:00
Adam Hill
9213bbd322
Merge branch 'dev' of github.com:diginc/docker-pi-hole into no_resolv_check
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-30 18:03:05 -05:00
Adam Hill
5b75953d91
New bash integration style test for volume data
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-30 18:01:43 -05:00
Adam Hill
72f5730d56
have tests use - not _ in tag
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-28 08:25:49 -05:00
Adam Hill
d7fdb188ed
remove resolv conf checks
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-26 10:45:48 -05:00
Adam Hill
d444a11ad1
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into beta-v5.0
2020-05-10 11:58:22 -05:00
Adam Hill
3c510e2edb
remove HTML web port sed/test, no hits exist anymore
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-04-18 15:18:15 -05:00
Dan Schaper
36c1e66dc1
Convert regex string to raw.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2020-04-18 12:48:51 -07:00
Adam Warner
ca9bf8ce5c
This should fix the tests
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-25 22:50:38 +00:00
Adam Hill
c024dcd8d9
Upgrade v4.3.3
...
Also remove ipv6 from tests, validation fails and breaks tests
Signed-off-by: Adam Hill <adam@diginc.us>
2020-02-23 22:33:42 -06:00
Adam Hill
4c4e9c3bc9
Beta v5.0
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-02-03 23:39:03 -06:00
Adam Hill
3765d41b5c
Update way too much
...
- Tox py3.7 + pipenv
- Python3 Dockerfile.py
- Dockerfile.py tags remote instead of just local image names now
- Circle.sh instead of in-line circle.yml script breakout
- probably other stuff I forgot
- Docker images build during the tests should hopefullly now be available at the deploy job workflow thanks to shared docker layers.
- Rename aarch64 to arm64 to reduce custom map
2020-01-30 20:26:57 -06:00
Adam Hill
9c5393dfa0
Merge branch 'dev' of github.com:diginc/docker-pi-hole into armel
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-01-01 21:25:53 -06:00
Adam Hill
096c6b5848
added armel with manual patch for now
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 21:42:26 -06:00
Adam Hill
8ab895b38a
bump some versions, remove unused
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 18:02:22 -06:00
cclauss
6987b36981
Use print() function in both Python 2 and Python 3
...
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
2019-08-31 22:07:13 +02:00
Adam Hill
89717949c4
Revert "missed test update"
...
This reverts commit 20b130a666
.
2019-06-01 12:18:10 -05:00
Martin Buchleitner
09131ad78f
Merge branch 'master' into k8s
...
* master:
Official tag time
Docker Pi-hole v4.3
2019-05-28 09:15:08 +02:00
Martin Buchleitner
7c402d329a
updated
2019-05-28 09:14:21 +02:00
Martin Buchleitner
20b130a666
missed test update
...
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
8ce0aafcd3
Fix #364
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
bbb770b6c0
disable this trash test
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
fea14ae5a4
sync
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
7da8fa586b
does this work any better
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
a4c4de3cf4
maybe
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
fded8bdcc4
show me your secrets
...
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
49d17bded0
back to using 2 dns
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
fea57446a5
revert to old setup
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
41fc498166
Slow down after setup to try to fix test
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
3e76bbd51f
add some more details to ouput to debut travis failure
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
7cb09b78db
empty the adlist for tests
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
062f94d0f7
Another flaky test, logs of readme
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
1322db7ec3
Slow down all the flakey tests to pass 100%
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
07bc55786b
Fixed tests!
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Adam Hill
397ec03285
remove ServerIP requirement, simpler example commands
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
Martin Buchleitner
f950671a1c
missed test update
...
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-08 08:31:42 +02:00
Adam Hill
02e3ead7eb
Docker Pi-hole v4.3
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-04-11 22:17:26 -05:00
Adam Hill
5dfa5398b8
Fix #364
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-17 00:18:34 -06:00