switch to using pihole/debian-base for pam fix
Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill
parent
a47f278df0
commit
10c44c9374
|
|
@ -39,7 +39,7 @@ os_base_vars = {
|
|||
images = {
|
||||
'v4.0': [
|
||||
{
|
||||
'base': 'debian:stretch-slim',
|
||||
'base': 'pihole/debian-base:latest',
|
||||
'arch': 'amd64'
|
||||
},
|
||||
{
|
||||
|
|
@ -92,6 +92,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
|
||||
build('pihole', 'v4.0', arch, args)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
FROM {{ pihole.base }}
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/{{ pihole.s6_version }}/s6-overlay-{{ pihole.s6arch }}.tar.gz
|
||||
|
||||
# Intentionally split out really long step, docker cache = fast builds!
|
||||
COPY setup.sh /usr/local/bin/setup.sh
|
||||
RUN bash -ex setup.sh 2>&1
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
FROM multiarch/debian-debootstrap:arm64-stretch-slim
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-aarch64.tar.gz
|
||||
|
||||
# Intentionally split out really long step, docker cache = fast builds!
|
||||
COPY setup.sh /usr/local/bin/setup.sh
|
||||
RUN bash -ex setup.sh 2>&1
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
FROM debian:stretch-slim
|
||||
FROM pihole/debian-base:latest
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
|
||||
|
||||
# Intentionally split out really long step, docker cache = fast builds!
|
||||
COPY setup.sh /usr/local/bin/setup.sh
|
||||
RUN bash -ex setup.sh 2>&1
|
||||
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
FROM multiarch/debian-debootstrap:armel-stretch-slim
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-arm.tar.gz
|
||||
|
||||
# Intentionally split out really long step, docker cache = fast builds!
|
||||
COPY setup.sh /usr/local/bin/setup.sh
|
||||
RUN bash -ex setup.sh 2>&1
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
FROM multiarch/debian-debootstrap:armhf-stretch-slim
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-armhf.tar.gz
|
||||
|
||||
# Intentionally split out really long step, docker cache = fast builds!
|
||||
COPY setup.sh /usr/local/bin/setup.sh
|
||||
RUN bash -ex setup.sh 2>&1
|
||||
|
||||
ENV S6OVERLAY_RELEASE https://github.com/just-containers/s6-overlay/releases/download/v1.21.4.0/s6-overlay-amd64.tar.gz
|
||||
COPY install.sh /usr/local/bin/install.sh
|
||||
ENV PIHOLE_INSTALL /root/ph_install.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,11 @@ export WEB_TAG='v4.0'
|
|||
# Only use for pre-production / testing
|
||||
export USE_CUSTOM_BRANCHES=false
|
||||
|
||||
apt-get update
|
||||
apt-get install -y curl procps
|
||||
curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
|
||||
mv /init /s6-init
|
||||
|
||||
if [[ $USE_CUSTOM_BRANCHES == true ]] ; then
|
||||
CORE_TAG='development'
|
||||
fi
|
||||
|
|
|
|||
30
setup.sh
30
setup.sh
|
|
@ -1,30 +0,0 @@
|
|||
#!/bin/bash -ex
|
||||
# Seperated specifically to enable easy modificaiton of Dockerfile to cache this really long step
|
||||
|
||||
# https://github.com/pi-hole/docker-pi-hole/issues/243
|
||||
# fix error AUDIT: Allow login in non-init namespaces
|
||||
# Credit to https://github.com/sequenceiq/docker-pam/blob/master/ubuntu-14.04/Dockerfile
|
||||
srclist="/etc/apt/sources.list"
|
||||
cat $srclist | while read line; do
|
||||
srcline="$(echo $line | sed 's/deb/deb-src/')"
|
||||
echo "$srcline" >> $srclist
|
||||
done;
|
||||
|
||||
apt-get update
|
||||
|
||||
cd /tmp
|
||||
apt-get -s -y build-dep pam > builddeps.txt
|
||||
apt-get -y build-dep pam
|
||||
|
||||
export CONFIGURE_OPTS=--disable-audit
|
||||
apt-get -b source pam
|
||||
#dpkg -i libpam-doc*.deb libpam-modules*.deb libpam-runtime*.deb libpam0g*.deb
|
||||
# Cleanup
|
||||
apt-get purge -y build-essential $(grep '^Inst' builddeps.txt | awk '{ print $2 }' | tr '\n' ' ')
|
||||
apt-get autoremove -y
|
||||
rm -rf /tmp/*
|
||||
|
||||
# Install s6
|
||||
apt-get install -y curl procps
|
||||
curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
|
||||
mv /init /s6-init
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
import pytest
|
||||
import testinfra
|
||||
|
||||
run_local = testinfra.get_backend(
|
||||
"local://"
|
||||
).get_module("Command").run
|
||||
|
||||
def test_scripts_pass_shellcheck():
|
||||
''' Make sure shellcheck does not find anything wrong with our shell scripts '''
|
||||
shellcheck = "find . -name '*.sh' -a ! ( -name 'list.sh' ) | while read file; do shellcheck -e SC1008 $file; done;"
|
||||
results = run_local(shellcheck)
|
||||
print results.stdout
|
||||
assert '' == results.stdout
|
||||
Loading…
Reference in New Issue