56f4933237
Add an addional version injection case, for when core versions are not on alternative branches.
...
Move ENV VAR up higher in the Dockerfile so that `install.sh` actually sees it...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-06 01:27:45 +01:00
88518b036d
Inject the container tag into the web interface footer
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-05 20:21:35 +01:00
3865e77c6e
Introduce internal PIHOLE_TAG variable so that we can see what tag the container is...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-05 00:59:34 +01:00
388f0f01a1
Disable some more `pihole` functions when run from within docker
...
Inject a message into the debug output that lets us know it's been run in a docker container
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-08-04 23:41:39 +01:00
4dba6339c7
Remove no longer needed workaround for resolvconf
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-07-21 21:31:34 +01:00
bd121aa471
@MichaIng Remove obsolete debconf-apt-progress workaround
...
Since https://github.com/pi-hole/pi-hole/pull/2962 debconf-apt-progress is not used anymore in the basic-install.sh script, making the workaround obsolete.
Signed-off-by: MichaIng <micha@dietpi.com>
2021-07-21 20:16:46 +02:00
ac444c44f2
Update install.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-05-03 15:25:26 +01:00
42f1fa3380
Wrong conditional...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-19 23:20:58 +01:00
5ca1dbf35f
Massive overhaul of `install.sh based on how I test fresh installs of differing branches/tags
...
First git clone the repos, next checkout the relevant branches and finally run the install script. Simples.
`sed`ed out a couple of other unsupported functions
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-19 23:06:00 +01:00
e6a45eb96b
prep for new release ( #830 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-14 19:18:20 +01:00
190844d0b0
remove no longer required code ( #736 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-14 14:36:55 +01:00
6532390647
Only set one PIHOLE_DNS_ entry in the install script ( #826 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-13 19:09:40 +01:00
3f0a7d85b1
bump web version
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-16 19:50:09 +00:00
0a8d174ef7
prep for new release
2021-01-27 18:11:32 +00:00
0f618ffc31
bump core and web version numbers
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-19 12:41:46 +00:00
1aefa3b063
bump core and web version numbers (we _have_ to find a better way!)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-15 20:42:32 +00:00
f1d4efe766
Unsupported OS detected: Debian 9
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-11-29 13:29:07 -06:00
7792b91ccc
set WEB_VERSION
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-11-29 13:15:05 -06:00
9a94ade8dd
Prepped dev for 5.2 which will then goto master for tagging
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-11-29 12:55:27 -06:00
41f109cf48
Bump web version
2020-08-09 21:22:28 -05:00
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
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
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
e78260cf8b
Fixing web version/build failure
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-10 12:43:41 -05:00
d444a11ad1
Merge branch 'dev' of github.com:pi-hole/docker-pi-hole into beta-v5.0
2020-05-10 11:58:22 -05:00
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
1b5abd4ad6
test
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-18 18:46:00 +01:00
6bf15d6577
update for core 4.3.4
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-24 18:05:02 +00:00
b74f50ba37
remove unnesacery lines from install.sh
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-16 17:43:21 +00:00
31132aa4ec
Wild experimentations to see what circle does...
2020-02-16 10:53:49 +00:00
4c4e9c3bc9
Beta v5.0
...
Signed-off-by: Adam Hill <adam@diginc.us>
2020-02-03 23:39:03 -06:00
096c6b5848
added armel with manual patch for now
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-12-31 21:42:26 -06:00
05977b507d
Update install.sh
2019-09-22 13:48:36 -05:00
a6e70b653d
Upgrade
2019-09-17 22:13:12 -05:00
cee3e47550
v4.3.1 core
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-07-01 22:48:19 -05:00
a2b28d03b8
Fix the footer version
...
Resolves #469
Signed-off-by: Adam Hill <adam@diginc.us>
2019-06-23 12:53:26 -05:00
fd48454649
Revert "initial commit on configdir as volume"
...
This reverts commit c1fb17a645
2019-06-01 12:16:14 -05:00
4b6c41f950
Merge pull request #454 from DistractionRectangle/Trim-docker-image
...
Trim Docker Image
2019-05-29 18:55:29 -05:00
09131ad78f
Merge branch 'master' into k8s
...
* master:
Official tag time
Docker Pi-hole v4.3
2019-05-28 09:15:08 +02:00
113da00d0a
Update install.sh
...
Shallow clone pihole and webinterface repos to target branch.
Only install curl and procps dependencies, as well as
ca-certificates for curl'ing against https
Cuts image size down by ~30MB (304MB -> 274MB)
Signed-off-by: DistractionRectangle <48034372+DistractionRectangle@users.noreply.github.com>
2019-05-19 19:19:24 -07:00
5eab0a9730
initial commit on configdir as volume
...
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
c08698c11a
Release v4.2.2
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
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
040d9fcee6
v4.2.1 & more robust user root fix
...
Signed-off-by: Adam Hill <adam@diginc.us>
Signed-off-by: Martin Buchleitner <mabunixda@gmail.com>
2019-05-09 16:50:18 +02:00
02e3ead7eb
Docker Pi-hole v4.3
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-04-11 22:17:26 -05:00
e23e0ef5bf
Release v4.2.2
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-18 13:14:56 -06:00
7ecf7c6f28
Fixed tests!
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-08 23:14:48 -06:00
0b8333f7bc
v4.2.1 & more robust user root fix
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 18:30:51 -06:00
18de6b3883
install FTL
...
Signed-off-by: Adam Hill <adam@diginc.us>
2019-02-03 11:27:49 -06:00
Adam Warner
MichaIng
Adam Hill
Daniel
Martin Buchleitner
DistractionRectangle