commit
8e5b17e7d3
|
@ -112,8 +112,9 @@ def run_and_stream_command_output(command, args):
|
||||||
print(line, end='')
|
print(line, end='')
|
||||||
build_result.wait()
|
build_result.wait()
|
||||||
if build_result.returncode != 0:
|
if build_result.returncode != 0:
|
||||||
print(" ::: Error running".format(command))
|
print(" ::: Error running {}".format(command))
|
||||||
print(build_result.stderr)
|
print(build_result.stderr)
|
||||||
|
sys.exit(build_resuilt.returncode)
|
||||||
|
|
||||||
|
|
||||||
def build(docker_repo, arch, args):
|
def build(docker_repo, arch, args):
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
#!/usr/bin/env sh
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
# alpine sh only
|
# alpine sh only
|
||||||
|
|
||||||
set -eux
|
set -eux
|
||||||
./Dockerfile.py -v --arch="${ARCH}" --hub_tag="${ARCH_IMAGE}"
|
./Dockerfile.py -v --no-cache --arch="${ARCH}" --hub_tag="${ARCH_IMAGE}"
|
||||||
# TODO: Add junitxml output and have circleci consume it
|
# TODO: Add junitxml output and have circleci consume it
|
||||||
# 2 parallel max b/c race condition with docker fixture (I think?)
|
# 2 parallel max b/c race condition with docker fixture (I think?)
|
||||||
py.test -vv -n 2 -k "${ARCH}" ./test/
|
py.test -vv -n 2 -k "${ARCH}" ./test/
|
||||||
|
|
|
@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0
|
||||||
ENV FTL_CMD no-daemon
|
ENV FTL_CMD no-daemon
|
||||||
ENV DNSMASQ_USER root
|
ENV DNSMASQ_USER root
|
||||||
|
|
||||||
ENV VERSION v5.0
|
ENV VERSION v5.1.1
|
||||||
ENV PATH /opt/pihole:${PATH}
|
ENV PATH /opt/pihole:${PATH}
|
||||||
|
|
||||||
LABEL image="pihole/pihole:v5.0_amd64"
|
LABEL image="pihole/pihole:v5.1.1_amd64"
|
||||||
LABEL maintainer="adam@diginc.us"
|
LABEL maintainer="adam@diginc.us"
|
||||||
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
|
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
|
||||||
|
|
||||||
|
|
|
@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0
|
||||||
ENV FTL_CMD no-daemon
|
ENV FTL_CMD no-daemon
|
||||||
ENV DNSMASQ_USER root
|
ENV DNSMASQ_USER root
|
||||||
|
|
||||||
ENV VERSION v5.0
|
ENV VERSION v5.1.1
|
||||||
ENV PATH /opt/pihole:${PATH}
|
ENV PATH /opt/pihole:${PATH}
|
||||||
|
|
||||||
LABEL image="pihole/pihole:v5.0_arm64"
|
LABEL image="pihole/pihole:v5.1.1_arm64"
|
||||||
LABEL maintainer="adam@diginc.us"
|
LABEL maintainer="adam@diginc.us"
|
||||||
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
|
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
|
||||||
|
|
||||||
|
|
|
@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0
|
||||||
ENV FTL_CMD no-daemon
|
ENV FTL_CMD no-daemon
|
||||||
ENV DNSMASQ_USER root
|
ENV DNSMASQ_USER root
|
||||||
|
|
||||||
ENV VERSION v5.0
|
ENV VERSION v5.1.1
|
||||||
ENV PATH /opt/pihole:${PATH}
|
ENV PATH /opt/pihole:${PATH}
|
||||||
|
|
||||||
LABEL image="pihole/pihole:v5.0_armel"
|
LABEL image="pihole/pihole:v5.1.1_armel"
|
||||||
LABEL maintainer="adam@diginc.us"
|
LABEL maintainer="adam@diginc.us"
|
||||||
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
|
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
|
||||||
|
|
||||||
|
|
|
@ -37,10 +37,10 @@ ENV ServerIP 0.0.0.0
|
||||||
ENV FTL_CMD no-daemon
|
ENV FTL_CMD no-daemon
|
||||||
ENV DNSMASQ_USER root
|
ENV DNSMASQ_USER root
|
||||||
|
|
||||||
ENV VERSION v5.0
|
ENV VERSION v5.1.1
|
||||||
ENV PATH /opt/pihole:${PATH}
|
ENV PATH /opt/pihole:${PATH}
|
||||||
|
|
||||||
LABEL image="pihole/pihole:v5.0_armhf"
|
LABEL image="pihole/pihole:v5.1.1_armhf"
|
||||||
LABEL maintainer="adam@diginc.us"
|
LABEL maintainer="adam@diginc.us"
|
||||||
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
|
LABEL url="https://www.github.com/pi-hole/docker-pi-hole"
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
FROM docker:latest
|
FROM python:buster
|
||||||
|
|
||||||
|
# Only works for docker CLIENT (bind mounted socket)
|
||||||
|
COPY --from=docker:18.09.3 /usr/local/bin/docker /usr/local/bin/
|
||||||
|
|
||||||
# Based on https://github.com/Ilhicas/alpine-pipenv
|
# Based on https://github.com/Ilhicas/alpine-pipenv
|
||||||
ARG packages
|
ARG packages
|
||||||
RUN apk --update add python3 python3-dev curl gcc make \
|
RUN apt-get update && \
|
||||||
musl-dev libffi-dev openssl-dev ${packages} \
|
apt-get install -y python3-dev curl gcc make \
|
||||||
&& rm -rf /var/cache/apk/* \
|
libffi-dev libssl-dev ${packages} \
|
||||||
&& pip3 install -U pip pipenv
|
&& pip3 install -U pip pipenv
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,7 +17,7 @@ COPY Pipfile* /root/
|
||||||
WORKDIR /root
|
WORKDIR /root
|
||||||
|
|
||||||
RUN pipenv install --system \
|
RUN pipenv install --system \
|
||||||
&& sed -i 's|/bin/sh|/bin/bash|g' /usr/lib/python3.8/site-packages/testinfra/backend/docker.py
|
&& sed -i 's|/bin/sh|/bin/bash|g' /usr/local/lib/python3.8/site-packages/testinfra/backend/docker.py
|
||||||
|
|
||||||
|
|
||||||
RUN echo "set -ex && Dockerfile.sh && \$@" > /usr/local/bin/entrypoint.sh
|
RUN echo "set -ex && Dockerfile.sh && \$@" > /usr/local/bin/entrypoint.sh
|
||||||
|
|
|
@ -12,6 +12,7 @@ if [[ "$1" == "enter" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# generate and build dockerfile
|
# generate and build dockerfile
|
||||||
|
docker pull python:buster
|
||||||
docker build -t image_pipenv -f Dockerfile_build .
|
docker build -t image_pipenv -f Dockerfile_build .
|
||||||
env > /tmp/env
|
env > /tmp/env
|
||||||
docker run --rm \
|
docker run --rm \
|
||||||
|
|
|
@ -4,7 +4,7 @@ mkdir -p /etc/pihole/
|
||||||
mkdir -p /var/run/pihole
|
mkdir -p /var/run/pihole
|
||||||
# Production tags with valid web footers
|
# Production tags with valid web footers
|
||||||
export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
|
export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
|
||||||
export WEB_VERSION="${CORE_VERSION}"
|
export WEB_VERSION="v5.1"
|
||||||
|
|
||||||
# Only use for pre-production / testing
|
# Only use for pre-production / testing
|
||||||
export CHECKOUT_BRANCHES=false
|
export CHECKOUT_BRANCHES=false
|
||||||
|
@ -15,6 +15,7 @@ fi
|
||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install --no-install-recommends -y curl procps ca-certificates
|
apt-get install --no-install-recommends -y curl procps ca-certificates
|
||||||
|
ln -s `which echo` /usr/local/bin/whiptail
|
||||||
curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
|
curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
|
||||||
mv /init /s6-init
|
mv /init /s6-init
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue