Commit Graph

868 Commits

Author SHA1 Message Date
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 25d32da895
Merge pull request #631 from pi-hole/new_volume_test_base
New volume test
2020-06-02 16:50:37 -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 d832213e3c limit branches to be built
Signed-off-by: Adam Hill <adam@diginc.us>
2020-06-02 08:59:37 -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 3b34fecc41
Merge pull request #618 from pi-hole/no_resolv_check
remove resolv.conf code
2020-05-30 18:30: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 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
Adam Hill 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
Adam Hill e7bb456701
Merge branch 'dev' into patch-1 2020-05-30 14:23:27 -05:00
Sandro 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
Daniel 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
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 0da5afcd61 print images in build image
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-28 08:15:01 -05:00
Adam Hill 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
Adam Hill 04ab6d447f docker-compose pip is garbage to install
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-27 00:42:32 -05:00
Adam Hill 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
Adam Hill caad778b0c install docker-compose;
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-27 00:10:40 -05:00
Adam Hill 808359e832
Merge pull request #608 from ahuffman/master
Fixes #557
2020-05-27 00:02:06 -05:00
Adam Hill 8e409bdf6f
Merge pull request #594 from lightswitch05/feature/consolidate-dockerfiles
Simplify Dockerfile configuration.
2020-05-27 00:00:34 -05:00
Adam Hill 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
Adam Hill d7fdb188ed remove resolv conf checks
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-26 10:45:48 -05:00
Dan Schaper a5b827917e
Merge branch 'master' into no_resolv_check 2020-05-25 18:23:13 -07:00
Daniel 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
Adam Hill c619303a30
Update ISSUE_TEMPLATE.md 2020-05-15 09:53:14 -05:00
Adam Hill cecf602df7
Merge branch 'master' into no_resolv_check 2020-05-12 08:42:35 -05:00
Adam Hill 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
Adam Hill 740248f18b
Add quote for path 2020-05-11 18:38:19 -05:00
Adam Hill bb292a301c
Merge pull request #615 from fhs/script-syntax
Fix docker_run.sh syntax
2020-05-11 18:26:15 -05:00
Adam Hill 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
Adam Hill 3140814a30
Merge branch 'master' into compose-traefic-2 2020-05-11 18:14:19 -05:00
Adam Hill 441bc67159
Update docker-compose-traefik-proxy.md 2020-05-11 18:12:08 -05:00
chinskiy 59753e30a3 pin traefik version, few more tweaks
Signed-off-by: chinskiy <chinskiy93@gmail.com>
2020-05-11 15:41:26 +03:00
Fazlul Shahriar 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
Adam Hill 34ef3d4d86 Merge branch 'master' of github.com:pi-hole/docker-pi-hole into dev 2020-05-10 15:23:58 -05:00
Adam Hill 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
Adam Hill eb637e07cc
Merge pull request #611 from pi-hole/beta-v5.0
v5.0 to master
2020-05-10 13:18:24 -05:00
Adam Hill e78260cf8b Fixing web version/build failure
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-10 12:43:41 -05:00
Adam Hill 6265a3c88f Revert "disable arm64"
This reverts commit 154272be8a.
2020-05-10 12:12:23 -05:00
Adam Hill 2c47cfa8c5 Merge branch 'master' of github.com:pi-hole/docker-pi-hole into beta-v5.0 2020-05-10 12:06:26 -05:00
Adam Hill 154272be8a disable arm64
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-10 12:04:43 -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 ce10b7b655
Merge pull request #562 from NazarKosteckij/patch-1
add missing env variables (Fix issue #553)
2020-05-06 21:46:47 -05:00
Adam Hill 032b53799d
Merge pull request #534 from warren-fisher/dev
Add to Ubuntu install section
2020-05-06 21:46:29 -05:00
Andrew J. Huffman 2228115a97
Fixes #557
* Refactored the prepare_configs function in bash_functions.sh
* Now able to set settings via the UI or ENV Variables - ENV Variables override when restarted
* Added ENV Variables for ADMIN_EMAIL, TEMPERATUREUNIT, and WEBUIBOXEDLAYOUT
    - Created setup_temp_unit function in bash_functions.sh
    - Created setup_ui_layout function in bash_functions.sh
    - Created setup_admin_email function in bash_functions.sh
* Updated README.md
    - Added docs on new ENV Variables
    - Updated True/False settings docs so they were quoted, otherwise misleading to k8s users and not "true" booleans

Signed-off-by: Andrew J. Huffman <ahuffman@vmware.com>
2020-05-04 17:29:47 -04:00
chinskiy 9778b5d9a4 update traefik-proxy.md because of traefik v2 uncompatible changes
Signed-off-by: chinskiy <chinskiy93@gmail.com>
2020-05-03 17:55:56 +03:00
Adam Warner 415ccbb132
restore ${CORE_VERSION} variable to FTL checkout command
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-19 12:42:35 +01:00
Adam Hill b9b8b1f8bd
Merge pull request #599 from pi-hole/test/ftl-patch
Latest CI error is a build script failure not a real build/test failure.  Its trying to push an image with this branch name as the docker tag but the image was built with v5 branch tag. merging shouldn't hurt
2020-04-18 18:48:42 -05:00