51daf5cba2
Merge branch 'master' of github.com:pi-hole/docker-pi-hole into bugfix/resolve-dev-merge-conflicts
...
Signed-off-by: Daniel <daniel@developerdan.com>
2020-07-16 16:26:21 -04:00
8e5b17e7d3
Merge pull request #653 from pi-hole/v5.1
...
v5.1.1
2020-07-15 19:03:39 -05:00
562b6c1d5a
Dockerfile.py aborts on error now, workaround whiptail not being wrapped by unattended
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 18:42:29 -05:00
0b2c4642df
v5.1.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 18:17:33 -05:00
1b4677b5ed
pull base image
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 17:42:24 -05:00
0958583bf2
debian, our one true savior from bad docker build base images
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 17:42:14 -05:00
b50e94e22d
revert
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 17:41:12 -05:00
bb8a8aeedd
fix pip
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 17:15:35 -05:00
d49eebc25d
fix pip in outer build container, commit templating
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 17:04:47 -05:00
4808b9fe8d
v5.1
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 16:48:50 -05:00
88fd258043
Merge pull request #635 from lightswitch05/feature/introduce-debian-version-tags
...
Introduce additional docker tags for the debian version.
2020-06-29 10:23:13 -05:00
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
3b8227c29d
Make image a parameter to allow running with any image
2020-06-03 08:34:28 -05:00
25d32da895
Merge pull request #631 from pi-hole/new_volume_test_base
...
New volume test
2020-06-02 16:50:37 -05:00
022b039718
added remove + recreate container test
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-06-02 12:27:09 -05:00
d832213e3c
limit branches to be built
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-06-02 08:59:37 -05:00
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
3b34fecc41
Merge pull request #618 from pi-hole/no_resolv_check
...
remove resolv.conf code
2020-05-30 18:30:48 -05:00
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
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
ce3d6e866e
Merge pull request #628 from SuperSandro2000/patch-1
...
Don't bind to 127.0.0.1 when listening on all ports
2020-05-30 14:25:55 -05:00
b093aaabd9
Merge pull request #626 from lightswitch05/feature/run-tests-on-github-actions
...
Feature: Run tests on GitHub actions
2020-05-30 14:24:39 -05:00
e7bb456701
Merge branch 'dev' into patch-1
2020-05-30 14:23:27 -05:00
ecb0aaf805
Don't bind to 127.0.0.1 when listening on all ports
...
Closes #495
Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
2020-05-30 07:04:55 +02:00
55ee5d0e60
Run circle-test.sh in Github Actions on push or PR
...
Signed-off-by: Daniel <daniel@developerdan.com>
2020-05-28 23:18:52 -04:00
72f5730d56
have tests use - not _ in tag
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-28 08:25:49 -05:00
0da5afcd61
print images in build image
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-28 08:15:01 -05:00
e621670df4
debian, our one true savior from bad docker build base images
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-27 19:26:53 -05:00
04ab6d447f
docker-compose pip is garbage to install
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-27 00:42:32 -05:00
92c19555bd
install docker-compose on circle in build image
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-27 00:15:53 -05:00
caad778b0c
install docker-compose;
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-27 00:10:40 -05:00
808359e832
Merge pull request #608 from ahuffman/master
...
Fixes #557
2020-05-27 00:02:06 -05:00
8e409bdf6f
Merge pull request #594 from lightswitch05/feature/consolidate-dockerfiles
...
Simplify Dockerfile configuration.
2020-05-27 00:00:34 -05:00
bd831bcc30
Merge branch 'no_resolv_check' of github.com:pi-hole/docker-pi-hole into no_resolv_check
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-26 10:46:34 -05:00
d7fdb188ed
remove resolv conf checks
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-26 10:45:48 -05:00
a5b827917e
Merge branch 'master' into no_resolv_check
2020-05-25 18:23:13 -07:00
6939ea024f
Simplify Dockerfile configuration.
...
* Simplify docker builds by consolidating all arch's into a single Dockerfile and using ARGS for various differences
* Introduce docker-compose based builds (build.yml) for simple management of the various args differences
Signed-off-by: Daniel <daniel@developerdan.com>
2020-05-15 16:06:48 -04:00
c619303a30
Update ISSUE_TEMPLATE.md
2020-05-15 09:53:14 -05:00
cecf602df7
Merge branch 'master' into no_resolv_check
2020-05-12 08:42:35 -05:00
8cb67fde23
Merge pull request #515 from mgalgs/docker-run-storage-dir
...
docker_run.sh: Add env var to specify storage directory
2020-05-11 19:02:30 -05:00
740248f18b
Add quote for path
2020-05-11 18:38:19 -05:00
bb292a301c
Merge pull request #615 from fhs/script-syntax
...
Fix docker_run.sh syntax
2020-05-11 18:26:15 -05:00
a1300b4c01
Merge pull request #607 from chinskiy/compose-traefic-2
...
Update docker-compose-traefik-proxy.md according to changes in traefik2.X
2020-05-11 18:15:42 -05:00
3140814a30
Merge branch 'master' into compose-traefic-2
2020-05-11 18:14:19 -05:00
441bc67159
Update docker-compose-traefik-proxy.md
2020-05-11 18:12:08 -05:00
59753e30a3
pin traefik version, few more tweaks
...
Signed-off-by: chinskiy <chinskiy93@gmail.com>
2020-05-11 15:41:26 +03:00
edde439023
Fix docker_run.sh syntax
...
The trailing backslash must be the last character on the line for it to
be interpreted as a continuation command.
Signed-off-by: Fazlul Shahriar <fshahriar@gmail.com>
2020-05-11 01:53:49 -04:00
34ef3d4d86
Merge branch 'master' of github.com:pi-hole/docker-pi-hole into dev
2020-05-10 15:23:58 -05:00
0a4c0af9a2
use tags for v5.0 show official release in footer
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-10 13:42:57 -05:00
eb637e07cc
Merge pull request #611 from pi-hole/beta-v5.0
...
v5.0 to master
2020-05-10 13:18:24 -05:00
Daniel
Adam Hill
Sandro
Dan Schaper
chinskiy
Fazlul Shahriar