Commit Graph

127 Commits

Author SHA1 Message Date
Adam Warner
5e79db52ab This does not appear to be an issue on bullseye - tested with the same command's listed here https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923479, but switched out buster for bullseye. Confirmed I was able to repro the buster issue on docker desktop for windows
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-08 13:26:11 +00:00
Adam Warner
806f734cdc Remove shim now that it is in the core repo https://github.com/pi-hole/pi-hole/pull/4515 (#965)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-04 21:46: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
27bdf81665 Combine nightly and main workflows into one. Tested functionality on a fork so this can come straight into dev
use dev images for the dev branch build.
Only disable pihole checkout on released tags - allow it in dev and nightly tags

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-11-17 23:42:49 +00:00
Adam Warner
c0d05f291d Add PIHOLE_VERSION as PIHOLE_DOCKER_TAG in the php environment instead of injecting the version into the admin page's footer (#930)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-10-23 16:32:14 +01:00
Adam Warner
c371768800 And ppc64le - It might work, it might not. Someone will tell us if it doesn't.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-15 18:32:38 +01:00
Adam Warner
3942d9a740 Repalce PIHOLE_TAG with PIHOLE_VERSION, it isn't actually needed after all.
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 23:43:59 +01:00
Adam Warner
7624fc3d56 Reduce Test step to only one arch (amd64/buster)
Migrate build and push step to native github actions using docker buildX - which should _hopefully_ resolve #735
Make some adjustments to Dockerfile/build.yml/install.sh to allow both gh-actions-test.sh to build using the test suite, and github actions native commands to build online

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 22:34:24 +01:00
Adam Warner
ca69e29514 Always install lastest released Pi-hole unless otherwise indicated by environment variables CORE_VERSION/WEB_VERSION/FTL_VERSION
This is closer to mimicking the installation of Pi-hole on bare metal, and also shaves about 40MB off of the size of a container not using custom branches.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-09-12 16:46:19 +01:00
Adam Warner
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
MichaIng
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
Adam Warner
ac444c44f2 Update install.sh
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-05-03 15:25:26 +01:00
Adam Warner
42f1fa3380 Wrong conditional...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-19 23:20:58 +01:00
Adam Warner
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
Adam Warner
e6a45eb96b prep for new release (#830)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-14 19:18:20 +01:00
Adam Warner
190844d0b0 remove no longer required code (#736)
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-04-14 14:36:55 +01:00
Adam Warner
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
Adam Warner
3f0a7d85b1 bump web version
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-02-16 19:50:09 +00:00
Adam Warner
0a8d174ef7 prep for new release 2021-01-27 18:11:32 +00:00
Adam Warner
0f618ffc31 bump core and web version numbers
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2021-01-19 12:41:46 +00:00
Adam Warner
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
Adam Hill
f1d4efe766 Unsupported OS detected: Debian 9
Signed-off-by: Adam Hill <adam@diginc.us>
2020-11-29 13:29:07 -06:00
Adam Hill
7792b91ccc set WEB_VERSION
Signed-off-by: Adam Hill <adam@diginc.us>
2020-11-29 13:15:05 -06:00
Adam Hill
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
Adam Hill
41f109cf48 Bump web version 2020-08-09 21:22:28 -05:00
Daniel
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
Adam Hill
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
Adam Hill
0b2c4642df v5.1.1
Signed-off-by: Adam Hill <adam@diginc.us>
2020-07-15 18:17:33 -05: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
e78260cf8b Fixing web version/build failure
Signed-off-by: Adam Hill <adam@diginc.us>
2020-05-10 12:43:41 -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 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 Warner
1b5abd4ad6 test
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-04-18 18:46:00 +01:00
Adam Warner
6bf15d6577 update for core 4.3.4
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-24 18:05:02 +00:00
Adam Warner
b74f50ba37 remove unnesacery lines from install.sh
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2020-02-16 17:43:21 +00:00
Adam Warner
31132aa4ec Wild experimentations to see what circle does... 2020-02-16 10:53:49 +00: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
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
05977b507d Update install.sh 2019-09-22 13:48:36 -05:00
Adam Hill
a6e70b653d Upgrade 2019-09-17 22:13:12 -05:00
Adam Hill
cee3e47550 v4.3.1 core
Signed-off-by: Adam Hill <adam@diginc.us>
2019-07-01 22:48:19 -05:00
Adam Hill
a2b28d03b8 Fix the footer version
Resolves #469

Signed-off-by: Adam Hill <adam@diginc.us>
2019-06-23 12:53:26 -05:00
Adam Hill
fd48454649 Revert "initial commit on configdir as volume"
This reverts commit c1fb17a645.

Signed-off-by: Adam Hill <adam@diginc.us>
2019-06-01 12:16:14 -05:00
Adam Hill
4b6c41f950 Merge pull request #454 from DistractionRectangle/Trim-docker-image
Trim Docker Image
2019-05-29 18:55:29 -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
DistractionRectangle
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