mirror/dnscrypt-server-docker
1
1
Fork 0
mirror of https://github.com/dnscrypt/dnscrypt-server-docker synced 2024-11-22 23:51:59 +01:00
Code Issues

Merge pull request #65 from PeterDaveHello/Dockerfile

Browse Source 
Refactor Dockerfile
This commit is contained in:
Frank Denis 2019-08-05 19:02:08 +02:00 committed by GitHub
commit 372c99adf2
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Dockerfile
View File

@ -1,21 +1,21 @@
FROM jedisct1/alpine-runit:latest FROM jedisct1/alpine-runit:latest
MAINTAINER Frank Denis MAINTAINER Frank Denis
SHELL ["/bin/sh", "-x", "-c"]
ENV SERIAL 3 ENV SERIAL 3
ENV CFLAGS=-Ofast
ENV BUILD_DEPS make gcc musl-dev git libevent-dev expat-dev shadow autoconf file openssl-dev byacc linux-headers ENV BUILD_DEPS make gcc musl-dev git libevent-dev expat-dev shadow autoconf file openssl-dev byacc linux-headers
ENV RUNTIME_DEPS bash util-linux coreutils findutils grep openssl ldns ldns-tools libevent expat libexecinfo coreutils drill ca-certificates ENV RUNTIME_DEPS bash util-linux coreutils findutils grep openssl ldns ldns-tools libevent expat libexecinfo coreutils drill ca-certificates
RUN set -x && \ RUN apk --no-cache upgrade && apk add --no-cache $RUNTIME_DEPS
apk --no-cache upgrade && apk add --no-cache $RUNTIME_DEPS && \ RUN update-ca-certificates 2> /dev/null || true
update-ca-certificates 2> /dev/null || true
ENV UNBOUND_GIT_URL https://github.com/jedisct1/unbound.git ENV UNBOUND_GIT_URL https://github.com/jedisct1/unbound.git
ENV UNBOUND_GIT_REVISION 4edb15ba417c78710069a5be8be3a6b5d8bdba9c ENV UNBOUND_GIT_REVISION 4edb15ba417c78710069a5be8be3a6b5d8bdba9c
RUN set -x && \ WORKDIR /tmp
apk add --no-cache $BUILD_DEPS && \
mkdir -p /tmp/src && \ RUN apk add --no-cache $BUILD_DEPS && \
cd /tmp/src && \
git clone --depth=1000 "$UNBOUND_GIT_URL" && \ git clone --depth=1000 "$UNBOUND_GIT_URL" && \
cd unbound && \ cd unbound && \
git checkout "$UNBOUND_GIT_REVISION" && \ git checkout "$UNBOUND_GIT_REVISION" && \
@ -23,7 +23,7 @@ RUN set -x && \
useradd -g _unbound -s /etc -d /dev/null _unbound && \ useradd -g _unbound -s /etc -d /dev/null _unbound && \
./configure --prefix=/opt/unbound --with-pthreads \ ./configure --prefix=/opt/unbound --with-pthreads \
--with-username=_unbound --with-libevent --enable-event-api && \ --with-username=_unbound --with-libevent --enable-event-api && \
make -j$(getconf _NPROCESSORS_ONLN) install && \ make -j"$(getconf _NPROCESSORS_ONLN)" install && \
mv /opt/unbound/etc/unbound/unbound.conf /opt/unbound/etc/unbound/unbound.conf.example && \ mv /opt/unbound/etc/unbound/unbound.conf /opt/unbound/etc/unbound/unbound.conf.example && \
apk del --purge $BUILD_DEPS && \ apk del --purge $BUILD_DEPS && \
rm -fr /opt/unbound/share/man && \ rm -fr /opt/unbound/share/man && \
@ -31,14 +31,11 @@ RUN set -x && \
ENV LIBSODIUM_GIT_URL https://github.com/jedisct1/libsodium.git ENV LIBSODIUM_GIT_URL https://github.com/jedisct1/libsodium.git
RUN set -x && \ RUN apk add --no-cache $BUILD_DEPS && \
apk add --no-cache $BUILD_DEPS && \
mkdir -p /tmp/src && \
cd /tmp/src && \
git clone --depth=1 --branch stable "$LIBSODIUM_GIT_URL" && \ git clone --depth=1 --branch stable "$LIBSODIUM_GIT_URL" && \
cd libsodium && \ cd libsodium && \
env CFLAGS=-Ofast ./configure --disable-dependency-tracking && \ ./configure --disable-dependency-tracking && \
make -j$(getconf _NPROCESSORS_ONLN) check && make -j$(getconf _NPROCESSORS_ONLN) install && \ make -j"$(getconf _NPROCESSORS_ONLN)" check && make -j"$(getconf _NPROCESSORS_ONLN)" install && \
ldconfig /usr/local/lib && \ ldconfig /usr/local/lib && \
apk del --purge $BUILD_DEPS && \ apk del --purge $BUILD_DEPS && \
rm -fr /tmp/* /var/tmp/* rm -fr /tmp/* /var/tmp/*
@ -48,11 +45,8 @@ ENV DNSCRYPT_WRAPPER_GIT_BRANCH xchacha-stamps
COPY queue.h /tmp COPY queue.h /tmp
RUN set -x && \ RUN apk add --no-cache $BUILD_DEPS && \
apk add --no-cache $BUILD_DEPS && \ git clone --depth=1 --branch="${DNSCRYPT_WRAPPER_GIT_BRANCH}" "${DNSCRYPT_WRAPPER_GIT_URL}" && \
mkdir -p /tmp/src && \
cd /tmp/src && \
git clone --depth=1 --branch=${DNSCRYPT_WRAPPER_GIT_BRANCH} ${DNSCRYPT_WRAPPER_GIT_URL} && \
cd dnscrypt-wrapper && \ cd dnscrypt-wrapper && \
sed -i 's#<sys/queue.h>#"/tmp/queue.h"#' compat.h && \ sed -i 's#<sys/queue.h>#"/tmp/queue.h"#' compat.h && \
sed -i 's#HAVE_BACKTRACE#NO_BACKTRACE#' compat.h && \ sed -i 's#HAVE_BACKTRACE#NO_BACKTRACE#' compat.h && \
@ -61,15 +55,12 @@ RUN set -x && \
useradd -g _dnscrypt-wrapper -s /etc -d /opt/dnscrypt-wrapper/empty _dnscrypt-wrapper && \ useradd -g _dnscrypt-wrapper -s /etc -d /opt/dnscrypt-wrapper/empty _dnscrypt-wrapper && \
groupadd _dnscrypt-signer && \ groupadd _dnscrypt-signer && \
useradd -g _dnscrypt-signer -G _dnscrypt-wrapper -s /etc -d /dev/null _dnscrypt-signer && \ useradd -g _dnscrypt-signer -G _dnscrypt-wrapper -s /etc -d /dev/null _dnscrypt-signer && \
make -j$(getconf _NPROCESSORS_ONLN) configure && \ make -j"$(getconf _NPROCESSORS_ONLN)" configure && \
env CFLAGS=-Ofast ./configure --prefix=/opt/dnscrypt-wrapper && \ ./configure --prefix=/opt/dnscrypt-wrapper && \
make -j$(getconf _NPROCESSORS_ONLN) install && \ make -j"$(getconf _NPROCESSORS_ONLN)" install && \
apk del --purge $BUILD_DEPS && \ apk del --purge $BUILD_DEPS && \
rm -fr /tmp/* /var/tmp/* rm -fr /tmp/* /var/tmp/*
RUN set -x && \
echo rm -rf /tmp/* /var/tmp/* /usr/local/include
RUN mkdir -p \ RUN mkdir -p \
/etc/service/unbound \ /etc/service/unbound \
/etc/service/watchdog /etc/service/watchdog