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

Set -x option in SHELL command in Dockerfile

Browse Source 
Intead of running `set -x` in the RUN commands
This commit is contained in:
Peter Dave Hello 2019-08-05 23:44:31 +08:00
parent d761f63ca6
commit f2ffba78a3
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@ -1,19 +1,18 @@
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 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 && \
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 && \ RUN apk add --no-cache $BUILD_DEPS && \
apk add --no-cache $BUILD_DEPS && \
mkdir -p /tmp/src && \ mkdir -p /tmp/src && \
cd /tmp/src && \ cd /tmp/src && \
git clone --depth=1000 "$UNBOUND_GIT_URL" && \ git clone --depth=1000 "$UNBOUND_GIT_URL" && \
@ -31,8 +30,7 @@ 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 && \ mkdir -p /tmp/src && \
cd /tmp/src && \ cd /tmp/src && \
git clone --depth=1 --branch stable "$LIBSODIUM_GIT_URL" && \ git clone --depth=1 --branch stable "$LIBSODIUM_GIT_URL" && \
@ -48,8 +46,7 @@ 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 && \
mkdir -p /tmp/src && \ mkdir -p /tmp/src && \
cd /tmp/src && \ cd /tmp/src && \
git clone --depth=1 --branch="${DNSCRYPT_WRAPPER_GIT_BRANCH}" "${DNSCRYPT_WRAPPER_GIT_URL}" && \ git clone --depth=1 --branch="${DNSCRYPT_WRAPPER_GIT_BRANCH}" "${DNSCRYPT_WRAPPER_GIT_URL}" && \
@ -67,8 +64,7 @@ RUN set -x && \
apk del --purge $BUILD_DEPS && \ apk del --purge $BUILD_DEPS && \
rm -fr /tmp/* /var/tmp/* rm -fr /tmp/* /var/tmp/*
RUN set -x && \ RUN echo rm -rf /tmp/* /var/tmp/* /usr/local/include
echo rm -rf /tmp/* /var/tmp/* /usr/local/include
RUN mkdir -p \ RUN mkdir -p \
/etc/service/unbound \ /etc/service/unbound \