Commit Graph

64 Commits

Author SHA1 Message Date
Adam Warner e1dc289d7d
Fix suggested spelling mistakes
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-04-22 17:41:29 +01: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 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
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 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 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 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 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 02e3ead7eb
Docker Pi-hole v4.3
Signed-off-by: Adam Hill <adam@diginc.us>
2019-04-11 22:17:26 -05:00
Adam Hill f9a21d2ff9
empty the adlist for tests
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-12 22:16:15 -06:00
Adam Hill 7ecf7c6f28
Fixed tests!
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-08 23:14:48 -06:00
Adam Hill fca7769b33
remove ServerIP requirement, simpler example commands
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-07 19:51:15 -06:00
Adam Hill d3309ebb1a
remove old blocking page setup/test
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 22:43:38 -06:00
Adam Hill 38d76d7ec8
fix conftest path to VERSION
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-21 20:37:05 -06:00
Adam Hill 440a7a19a5
v4.2 and Version pulled from a file now
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-20 23:59:35 -06:00
Adam Hill 19fee6fa5e
README update for 4.1.1 and test improvement
* split out arg fixture to improve grainularity of test overriding
* README points out new arguments that improve likelihood of success

Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-08 21:01:42 -06:00
Adam Hill a5211510db
Adding no-daemon opt back in which works with correct capabilities (NET_ADMIN)
Signed-off-by: Adam Hill <adam@diginc.us>
2019-01-01 14:46:34 -06:00
Adam Hill d0b35cec63
4.1.1
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-24 11:23:17 -06:00
Adam Hill b39a2ad69a
arm version complained/crashed on no TTY
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-13 18:33:08 -06:00
Adam Hill d7a125a706
Version 4.1
Signed-off-by: Adam Hill <adam@diginc.us>
2018-12-12 20:43:08 -06:00
Adam Hill 63f2c4ea00
Fixing error with random passwords, null checking moved earlier
Signed-off-by: Adam Hill <adam@diginc.us>
2018-09-18 00:11:26 -05:00
Adam Hill f8d37693ed
Fix regex writing for web, fix deploying latest
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 22:23:22 -05:00
Adam Hill 65a1ac7f1e
grab version on startup for web footer. 2 tests stablized
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 18:20:55 -05:00
Adam Hill 999f02b598
start of fixing race condition by not having test+s6 both run /start.sh
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-05 18:13:25 -05:00
Adam Hill 80d5b9dbc1
Test image name updates, passing locally. reorg Dockerfile to build fast, starting on new deploy
Signed-off-by: Adam Hill <adam@diginc.us>
2018-08-04 13:31:58 -05:00
Adam Hill 478b98c503
Merge branch 'dev' of github.com:diginc/docker-pi-hole into prerelease
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-17 19:44:34 -05:00
Adam Hill c17cd37eca
armel build script and dockerfile stuffs
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-16 23:43:55 -05:00
diginc ad6b4be403 Fixes to the startup, services, and dnsmasq references 2018-07-03 00:19:01 -05:00
diginc 615af98eab delete all the alpine 2018-01-03 20:09:47 -06:00
diginc aab0b3f3cb fix debian test_pihole_start_cmd 2017-12-07 20:27:06 -06:00
diginc 94c90d9b91 comma 2017-11-05 21:30:32 -06:00
diginc bcfcc85ef3 removed impossible testing combos 2017-11-05 21:30:07 -06:00
diginc 8886784b2e fix webserver and image 2017-10-18 22:24:22 -05:00
diginc dded3945f5 switch to dash, update persist to use new style tag 2017-10-18 22:02:23 -05:00
diginc 7c85ac8d32 Split build out from tests to ensure it runs first 2017-10-16 23:45:39 -05:00
diginc b372f0101d move docker image building to be a global autouse fixture to make sure it runs before tests that use output 2017-10-08 12:57:17 -05:00
diginc d98837c828 expand most tests to run for all os arch combos 2017-10-05 11:59:19 -05:00
diginc 18997fe9f6 templated dockerfiles building used by tests
* test images are built without diginc/ namespace
* no tests for other archs yet, unsure if they'll even build on travis
* Removed old dockerfiles
* New files names require Docker Cloud reconfiguration when merged upstream
* Probably some stuff I missed, just ask me
2017-10-02 22:52:02 -05:00
diginc b9095bc123 This commit is too big, but it works
* Tests are passing, hopefully consistently
* FTL pulling from official releases
  * thanks @DL6ER for the musl-libc build
* Thanks middleagedman for the IPv6 fixes
* Thanks everyone for patience while I get this release working!
2017-05-13 17:03:24 -05:00
diginc 9f61b87198 debian converted to s6, aline files moved 2017-05-05 21:48:03 -05:00