diff --git a/Dockerfile b/Dockerfile index 21295d3..56a495b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:18.04 MAINTAINER Robin Smidsrød @@ -7,11 +7,10 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get -q -y update \ && apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install apt-utils \ && apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" dist-upgrade \ - && apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install isc-dhcp-server man \ + && apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install dumb-init isc-dhcp-server man \ && apt-get -q -y autoremove \ && apt-get -q -y clean \ && rm -rf /var/lib/apt/lists/* -COPY util/dumb-init_1.2.0_amd64 /usr/bin/dumb-init COPY util/entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index bd9a7c4..9122c86 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -1,4 +1,4 @@ -FROM ubuntu:xenial +FROM ubuntu:18.04 MAINTAINER Simon Holzmayer @@ -7,11 +7,10 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get -q -y update \ && apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install apt-utils \ && apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" dist-upgrade \ - && apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install isc-dhcp-server man \ + && apt-get -q -y -o "DPkg::Options::=--force-confold" -o "DPkg::Options::=--force-confdef" install dumb-init isc-dhcp-server man \ && apt-get -q -y autoremove \ && apt-get -q -y clean \ && rm -rf /var/lib/apt/lists/* -COPY util/dumb-init_1.2.0_armhf /usr/bin/dumb-init COPY util/entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/util/dumb-init_1.2.0_amd64 b/util/dumb-init_1.2.0_amd64 deleted file mode 100755 index 2fb1fa1..0000000 Binary files a/util/dumb-init_1.2.0_amd64 and /dev/null differ diff --git a/util/dumb-init_1.2.0_armhf b/util/dumb-init_1.2.0_armhf deleted file mode 100755 index 292edc0..0000000 Binary files a/util/dumb-init_1.2.0_armhf and /dev/null differ