Commit Graph

19 Commits

Author SHA1 Message Date
Adam Warner ee20e52d75
use bullseye base image
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-03-28 22:15:49 +01:00
Adam Warner 90f4ebe882
revert base image to buster, we can try bullseye again later
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-02-12 22:48:58 +00:00
Adam Warner eed203530e
while I'm in here - drop S6 overlay version per https://github.com/just-containers/s6-overlay/issues/329
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-17 23:28:37 +00:00
Adam Warner 0018e46a28
Bullseye anyone?
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-08 12:55:54 +00:00
Adam Warner 44bdfc1438
bump s6 to latest
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-01-02 14:30:06 +00:00
Adam Warner 7848d06325
Switch base from `debian:buster-slim` to `ghcr.io/pi-hole/docker-pi-hole-base:buster-slim`, which is updated weekly and should speed up build times on this end 2021-12-11 00:20:04 +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 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
Sebastian Haderecker ee6e1b36a9 Healthcheck: Shorten dig output
Signed-off-by: Sebastian Haderecker <sebastian.haderecker@gmail.com>
2021-08-22 22:04:36 +02: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 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
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
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 c0e55c156f
Remove port 443 from templates and documentation. (Redo) (#808)
* Update docker_run.sh

* Update docker-compose.yml.example

* Update README.md

* Update Dockerfile

Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
2021-02-26 20:09:31 +00: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
diginc c3c94b8955 a bunch of documentation tweaks 2017-05-22 23:39:56 -05:00
diginc 972a6c3c39 alpine nginx pihole working, weighing in at 85.36 MB vs debian 252.4 MB 2016-02-13 13:24:44 -06:00