Merge remote-tracking branch 'origin/pr/221' into Installer_patches
This commit is contained in:
diginc
commit
39a8802c74
|
|
@ -44,11 +44,11 @@ images = {
|
|||
'arch': 'amd64'
|
||||
},
|
||||
{
|
||||
'base': 'multiarch/debian-debootstrap:armhf-jessie-slim',
|
||||
'base': 'multiarch/debian-debootstrap:armhf-stretch-slim',
|
||||
'arch': 'armhf'
|
||||
},
|
||||
{
|
||||
'base': 'multiarch/debian-debootstrap:arm64-jessie-slim',
|
||||
'base': 'multiarch/debian-debootstrap:arm64-stretch-slim',
|
||||
'arch': 'aarch64'
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ LABEL image="{{ pihole.name }}:{{ pihole.os }}_{{ pihole.arch }}"
|
|||
LABEL maintainer="{{ pihole.maintainer }}"
|
||||
LABEL url="https://www.github.com/diginc/docker-pi-hole"
|
||||
|
||||
ARG DEBIAN_FRONTED=noninteractive
|
||||
ENV TAG {{ pihole.os }}
|
||||
ENV ARCH {{ pihole.arch }}
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
|
@ -14,7 +15,7 @@ ENV PIHOLE_INSTALL /tmp/ph_install.sh
|
|||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/{{ pihole.s6_version }}/s6-overlay-{{ pihole.arch }}.tar.gz
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y wget curl net-tools cron && \
|
||||
apt-get install -y wget curl net-tools cron procps && \
|
||||
curl -L -s $S6OVERLAY_RELEASE \
|
||||
| tar xvzf - -C / && \
|
||||
docker-install.sh && \
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
FROM multiarch/debian-debootstrap:arm64-jessie-slim
|
||||
FROM multiarch/debian-debootstrap:arm64-stretch-slim
|
||||
|
||||
LABEL image="diginc/pi-hole:debian_aarch64"
|
||||
LABEL maintainer="adam@diginc.us"
|
||||
LABEL url="https://www.github.com/diginc/docker-pi-hole"
|
||||
|
||||
ARG DEBIAN_FRONTED=noninteractive
|
||||
ENV TAG debian
|
||||
ENV ARCH aarch64
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
|
@ -14,7 +15,7 @@ ENV PIHOLE_INSTALL /tmp/ph_install.sh
|
|||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.2.2/s6-overlay-aarch64.tar.gz
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y wget curl net-tools cron && \
|
||||
apt-get install -y wget curl net-tools cron procps && \
|
||||
curl -L -s $S6OVERLAY_RELEASE \
|
||||
| tar xvzf - -C / && \
|
||||
docker-install.sh && \
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
FROM debian:jessie
|
||||
FROM debian:stretch
|
||||
|
||||
LABEL image="diginc/pi-hole:debian_amd64"
|
||||
LABEL maintainer="adam@diginc.us"
|
||||
LABEL url="https://www.github.com/diginc/docker-pi-hole"
|
||||
|
||||
ARG DEBIAN_FRONTED=noninteractive
|
||||
ENV TAG debian
|
||||
ENV ARCH amd64
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
|
@ -14,7 +15,7 @@ ENV PIHOLE_INSTALL /tmp/ph_install.sh
|
|||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.2.2/s6-overlay-amd64.tar.gz
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y wget curl net-tools cron && \
|
||||
apt-get install -y wget curl net-tools cron procps && \
|
||||
curl -L -s $S6OVERLAY_RELEASE \
|
||||
| tar xvzf - -C / && \
|
||||
docker-install.sh && \
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
FROM multiarch/debian-debootstrap:armhf-jessie-slim
|
||||
FROM multiarch/debian-debootstrap:armhf-stretch-slim
|
||||
|
||||
LABEL image="diginc/pi-hole:debian_armhf"
|
||||
LABEL maintainer="adam@diginc.us"
|
||||
LABEL url="https://www.github.com/diginc/docker-pi-hole"
|
||||
|
||||
ARG DEBIAN_FRONTED=noninteractive
|
||||
ENV TAG debian
|
||||
ENV ARCH armhf
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
|
@ -14,7 +15,7 @@ ENV PIHOLE_INSTALL /tmp/ph_install.sh
|
|||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.2.2/s6-overlay-armhf.tar.gz
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y wget curl net-tools cron && \
|
||||
apt-get install -y wget curl net-tools cron procps && \
|
||||
curl -L -s $S6OVERLAY_RELEASE \
|
||||
| tar xvzf - -C / && \
|
||||
docker-install.sh && \
|
||||
|
|
|
|||
23
README.md
23
README.md
|
|
@ -1,7 +1,11 @@
|
|||
## Imporant Note to alpine / arm tag users:
|
||||
|
||||
**Debian is now the only supported base OS for `diginc/pi-hole`** to improve consistency and updates. Alpine OS was dropped and ARM has moved to a new image/tag name. The ARM Debian tag was removed from `diginc/pi-hole` but is still supported at it's now image repostiroy home, [diginc/pi-hole-multiarch](https://hub.docker.com/r/diginc/pi-hole-multiarch/tags/) where it has both an `:debian_armhf` and `:debian_aarch64` version
|
||||
|
||||
A [Docker](https://www.docker.com/what-docker) project to make lightweight x86 and ARM container with [pi-hole](https://pi-hole.net) functionality. Why? Originally designed to be a quick, easy, and portable way to run x86 Pi-Hole, it now has an arm specific tag too.
|
||||
|
||||
1) Install docker for your [x86-64 system](https://www.docker.com/community-edition) or [ARMv6l/ARMv7 system](https://www.raspberrypi.org/blog/docker-comes-to-raspberry-pi/) using those links.
|
||||
2) Use the appropriate tag (x86 can use default tag, ARM users need to use images from `diginc/docker-pi-hole-multiarch`) in the below `docker run` command
|
||||
2) Use the appropriate tag (x86 can use default tag, ARM users need to use images from `diginc/pi-hole-multiarch:debian_armhf`) in the below `docker run` command
|
||||
3) Enjoy!
|
||||
|
||||
[](https://travis-ci.org/diginc/docker-pi-hole) [](https://store.docker.com/community/images/diginc/pi-hole) [](https://store.docker.com/community/images/diginc/pi-hole)
|
||||
|
|
@ -89,17 +93,20 @@ The primary docker tags / versions are explained in the following table. [Click
|
|||
| --- | ------------ | ----------- | ---------- |
|
||||
| `debian` / `latest` | x86 | Debian x86 image, container running lighttpd and dnsmasq | [Dockerfile](https://github.com/diginc/docker-pi-hole/blob/master/debian.docker) |
|
||||
|
||||
### `diginc/pi-hole:debian` [](https://microbadger.com/images/diginc/pi-hole "Get your own image badge on microbadger.com") [](https://microbadger.com/images/diginc/pi-hole "Get your own version badge on microbadger.com")
|
||||
### `diginc/pi-hole:debian` [](https://microbadger.com/images/diginc/pi-hole "Get your own image badge on microbadger.com") [](https://microbadger.com/images/diginc/pi-hole "Get your own version badge on microbadger.com") [](https://microbadger.com/images/diginc/pi-hole "Get your own version badge on microbadger.com")
|
||||
|
||||
This version of the docker aims to be as close to a standard pi-hole installation by using the same base OS and the exact configs and scripts (minimally modified to get them working). This serves as a stable baseline for merging and testing upstream repository pi-hole changes. Use this if you don't care about image size and want as stable of a product as possible.
|
||||
This version of the docker aims to be as close to a standard pi-hole installation by using the recommended base OS and the exact configs and scripts (minimally modified to get them working). This enables fast updating when an update comes from pi-hole.
|
||||
|
||||
### `diginc/pi-hole:alpine` [](https://microbadger.com/images/diginc/pi-hole "Get your own image badge on microbadger.com") [](https://microbadger.com/images/diginc/pi-hole "Get your own version badge on microbadger.com") [](https://microbadger.com/images/diginc/pi-hole "Get your own version badge on microbadger.com")
|
||||
|
||||
**DEPRECATED** - no longer supported
|
||||
|
||||
### `diginc/pi-hole-multiarch:debian-armhf`
|
||||
### `diginc/pi-hole-multiarch:debian_armhf` [](https://microbadger.com/images/diginc/pi-hole-multiarch "Get your own image badge on microbadger.com")
|
||||
Latest version of ARM-compatible pihole image
|
||||
|
||||
https://hub.docker.com/r/diginc/pi-hole-multiarch/tags/
|
||||
|
||||
### `diginc/pi-hole-multiarch:debian_aarch64` [](https://microbadger.com/images/diginc/pi-hole-multiarch "Get your own image badge on microbadger.com")
|
||||
Latest version of ARM64-compatible pihole image
|
||||
|
||||
https://hub.docker.com/r/diginc/pi-hole-multiarch/tags/
|
||||
|
||||
## Upgrading, Persistence, and Customizations
|
||||
|
||||
The standard pi-hole customization abilities apply to this docker, but with docker twists such as using docker volume mounts to map host stored file configurations over the container defaults. Volumes are also important to persist the configuration in case you have removed the pi-hole container which is a typical docker upgrade pattern.
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ export USE_DEVELOPMENT_BRANCHES=true
|
|||
# Make pihole scripts fail searching for `systemctl`,
|
||||
# which fails pretty miserably in docker compared to `service`
|
||||
# For more info see docker/docker issue #7459
|
||||
mv "$(which systemctl)" /bin/no_systemctl && \
|
||||
which systemctl && mv "$(which systemctl)" /bin/no_systemctl
|
||||
# debconf-apt-progress seems to hang so get rid of it too
|
||||
mv "$(which debconf-apt-progress)" /bin/no_debconf-apt-progress
|
||||
which which debconf-apt-progress && mv "$(which debconf-apt-progress)" /bin/no_debconf-apt-progress
|
||||
|
||||
# Get the install functions
|
||||
CUSTOM_INSTALL='development'
|
||||
|
|
|
|||
Loading…
Reference in New Issue