Skip to content

Commit

Permalink
remove drill and internal healthcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
klutchell committed Oct 25, 2019
1 parent 77596c2 commit ec2e400
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
11 changes: 1 addition & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG DNSCRYPT_PROXY_URL=https://github.com/DNSCrypt/dnscrypt-proxy/archive/

ENV CGO_ENABLED 0

RUN apk add --no-cache ca-certificates=20190108-r0 curl=7.66.0-r0 drill=1.7.0-r2 \
RUN apk add --no-cache ca-certificates=20190108-r0 curl=7.66.0-r0 \
&& curl -L "${DNSCRYPT_PROXY_URL}${DNSCRYPT_PROXY_VERSION}.tar.gz" -o /tmp/dnscrypt-proxy.tar.gz \
&& tar xzf /tmp/dnscrypt-proxy.tar.gz --strip 1 -C /go/src/github.com/DNSCrypt \
&& go build -v -ldflags="-s -w" \
Expand Down Expand Up @@ -43,17 +43,8 @@ COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=build /go/src/github.com/DNSCrypt/dnscrypt-proxy/dnscrypt-proxy /usr/local/bin/
COPY --from=build --chown=nonroot /config /config

COPY --from=build /usr/bin/drill /usr/bin/drill
COPY --from=build /usr/lib/libldns.so.2 /usr/lib/libldns.so.2.0.0 /usr/lib/libcrypto.so.1.1 /usr/lib/
COPY --from=build /lib/libcrypto.so.1.1 /lib/ld-musl-*.so.1 /lib/libc.musl-*.so.1 /lib/

USER nonroot

ENTRYPOINT ["dnscrypt-proxy", "-config", "/config/dnscrypt-proxy.toml"]

HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
CMD [ "drill", "-p", "5053", "dnscrypt.info", "@127.0.0.1" ]

RUN ["dnscrypt-proxy", "-version"]

RUN ["drill", "-v"]
2 changes: 1 addition & 1 deletion test/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ services:
image: klutchell/dnscrypt-proxy
dig:
image: alpine:3.10
command: sh -c 'apk add -q --no-cache drill=1.7.0-r2 && drill -p 5053 dnscrypt.info @dnscrypt-proxy'
command: sh -c 'apk add -q --no-cache drill=1.7.0-r2 && drill -p 5053 dnscrypt.info @dnscrypt-proxy | tee /dev/stderr | grep -q NOERROR'
links:
- dnscrypt-proxy

0 comments on commit ec2e400

Please sign in to comment.