added armel with manual patch for now
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill
parent
49ed8a0b2c
commit
096c6b5848
|
|
@ -99,9 +99,9 @@ def build_dockerfiles(args):
|
|||
|
||||
for arch in args['--arch']:
|
||||
# TODO: include from external .py that can be shared with Dockerfile.py / Tests / deploy scripts '''
|
||||
if arch == 'armel':
|
||||
print("Skipping armel, incompatible upstream binaries/broken")
|
||||
continue
|
||||
#if arch == 'armel':
|
||||
# print("Skipping armel, incompatible upstream binaries/broken")
|
||||
# continue
|
||||
build('pihole', arch, args)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
FROM {{ pihole.base }}
|
||||
|
||||
ENV ARCH {{ pihole.arch }}
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/{{ pihole.s6_version }}/s6-overlay-{{ pihole.s6arch }}.tar.gz
|
||||
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
COPY VERSION /etc/docker-pi-hole-version
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
|
@ -36,7 +38,6 @@ ENV FTL_CMD no-daemon
|
|||
ENV DNSMASQ_USER root
|
||||
|
||||
ENV VERSION {{ pihole.version }}
|
||||
ENV ARCH {{ pihole.arch }}
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
||||
LABEL image="{{ pihole.name }}:{{ pihole.version }}_{{ pihole.arch }}"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
FROM multiarch/debian-debootstrap:arm64-stretch-slim
|
||||
|
||||
ENV ARCH aarch64
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-aarch64.tar.gz
|
||||
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
COPY VERSION /etc/docker-pi-hole-version
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
|
@ -36,7 +38,6 @@ ENV FTL_CMD no-daemon
|
|||
ENV DNSMASQ_USER root
|
||||
|
||||
ENV VERSION v4.3.2
|
||||
ENV ARCH aarch64
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
||||
LABEL image="pihole/pihole:v4.3.2_aarch64"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
FROM pihole/debian-base:latest
|
||||
|
||||
ENV ARCH amd64
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-amd64.tar.gz
|
||||
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
COPY VERSION /etc/docker-pi-hole-version
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
|
@ -36,7 +38,6 @@ ENV FTL_CMD no-daemon
|
|||
ENV DNSMASQ_USER root
|
||||
|
||||
ENV VERSION v4.3.2
|
||||
ENV ARCH amd64
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
||||
LABEL image="pihole/pihole:v4.3.2_amd64"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
FROM multiarch/debian-debootstrap:armel-stretch-slim
|
||||
|
||||
ENV ARCH armel
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-arm.tar.gz
|
||||
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
COPY VERSION /etc/docker-pi-hole-version
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
|
@ -36,7 +38,6 @@ ENV FTL_CMD no-daemon
|
|||
ENV DNSMASQ_USER root
|
||||
|
||||
ENV VERSION v4.3.2
|
||||
ENV ARCH armel
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
||||
LABEL image="pihole/pihole:v4.3.2_armel"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
FROM multiarch/debian-debootstrap:armhf-stretch-slim
|
||||
|
||||
ENV ARCH armhf
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.7.0/s6-overlay-armhf.tar.gz
|
||||
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
COPY VERSION /etc/docker-pi-hole-version
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
|
@ -36,7 +38,6 @@ ENV FTL_CMD no-daemon
|
|||
ENV DNSMASQ_USER root
|
||||
|
||||
ENV VERSION v4.3.2
|
||||
ENV ARCH armhf
|
||||
ENV PATH /opt/pihole:${PATH}
|
||||
|
||||
LABEL image="pihole/pihole:v4.3.2_armhf"
|
||||
|
|
|
|||
|
|
@ -95,6 +95,11 @@ else
|
|||
fetch_release_metadata "${PI_HOLE_LOCAL_REPO}" "${CORE_VERSION}"
|
||||
fetch_release_metadata "${webInterfaceDir}" "${WEB_VERSION}"
|
||||
fi
|
||||
# FTL Armel fix not in prod yet
|
||||
# Remove once https://github.com/pi-hole/pi-hole/commit/3fbb0ac8dde14b8edc1982ae3a2a021f3cf68477 is in master
|
||||
if [[ "$ARCH" == 'armel' ]]; then
|
||||
curl -o /usr/bin/pihole-FTL https://ftl.pi-hole.net/development/pihole-FTL-armel-native
|
||||
fi
|
||||
|
||||
sed -i 's/readonly //g' /opt/pihole/webpage.sh
|
||||
sed -i '/^WEBPASSWORD/d' /etc/pihole/setupVars.conf
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ def DockerPersist(request, persist_test_args, persist_args, persist_image, persi
|
|||
def entrypoint():
|
||||
return ''
|
||||
|
||||
@pytest.fixture(params=['amd64', 'armhf', 'aarch64'])
|
||||
@pytest.fixture(params=['amd64', 'armhf', 'aarch64', 'armel'])
|
||||
def arch(request):
|
||||
return request.param
|
||||
|
||||
|
|
|
|||
5
tox.ini
5
tox.ini
|
|
@ -8,6 +8,7 @@ deps = -rrequirements.txt
|
|||
commands = docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
||||
./Dockerfile.py -v --arch amd64
|
||||
pytest -vv -n auto -k amd64 ./test/
|
||||
./Dockerfile.py -v --arch armhf --arch aarch64
|
||||
pytest -vv -n auto -k armhf ./test/
|
||||
./Dockerfile.py -v --arch armhf --arch aarch64 --arch armel
|
||||
pytest -vv -n auto -k aarch64 ./test/
|
||||
pytest -vv -n auto -k armhf ./test/
|
||||
pytest -vv -n auto -k armel ./test/
|
||||
|
|
|
|||
Loading…
Reference in New Issue