Build separate Docker image for doh-server and doh-client

Make doh-client also listen on both IPv4 and IPv6
This commit is contained in:
Jan Grewe
2019-05-16 20:47:40 +02:00
parent 5c27ae02c0
commit c8c22873bb
2 changed files with 22 additions and 3 deletions

21
Dockerfile.client Normal file
View File

@@ -0,0 +1,21 @@
FROM golang:alpine AS build-env
WORKDIR /src
ADD . /src
RUN apk add --no-cache git make
RUN make doh-client/doh-client
FROM alpine:latest
COPY --from=build-env /src/doh-client/doh-client /doh-client
ADD doh-client/doh-client.conf /doh-client.conf
RUN sed -i '$!N;s/"127.0.0.1:53",.*"127.0.0.1:5380",/":53",/;P;D' /doh-client.conf
RUN sed -i '$!N;s/"\[::1\]:53",.*"\[::1\]:5380",/":5380",/;P;D' /doh-client.conf
EXPOSE 53
EXPOSE 5380
ENTRYPOINT ["/doh-client"]
CMD ["-conf", "/doh-client.conf"]

View File

@@ -3,14 +3,12 @@ FROM golang:alpine AS build-env
WORKDIR /src
ADD . /src
RUN apk add --no-cache git make
RUN make
RUN make doh-server/doh-server
FROM alpine:latest
COPY --from=build-env /src/doh-client/doh-client /doh-client
COPY --from=build-env /src/doh-server/doh-server /doh-server
ADD doh-client/doh-client.conf /doh-client.conf
ADD doh-server/doh-server.conf /doh-server.conf
RUN sed -i '$!N;s/"127.0.0.1:8053",\s*"\[::1\]:8053",/":8053",/;P;D' /doh-server.conf