public/docker-dnsmasq
3
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 3 Activity

Update alpine and webproc

Browse Source 
In this commit I've done the following. These changes have been tested and confirmed to work.

- Updated Alpine to 3.14 and Webproc to 0.4.0
- The WEBPROC variable names have changed due to a renaming of the downloadable assets on GitHub
- The Webproc flags have changed slightly due to an upstream syntax change
This commit is contained in:
Luke Tainton 2021-10-14 12:43:07 +01:00 committed by GitHub
parent 8d53a286df
commit 0cfcebdd23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -1,15 +1,15 @@
FROM alpine:3.11 as build FROM alpine:3.14 as build
LABEL maintainer="David Chidell (dchidell@cisco.com)" LABEL maintainer="David Chidell (dchidell@cisco.com)"
FROM build as webproc FROM build as webproc
ENV WEBPROC_VERSION 0.2.2 ENV WEBPROCVERSION 0.4.0
ENV WEBPROC_URL https://github.com/jpillora/webproc/releases/download/$WEBPROC_VERSION/webproc_linux_amd64.gz ENV WEBPROCURL https://github.com/jpillora/webproc/releases/download/v$WEBPROCVERSION/webproc_"$WEBPROCVERSION"_linux_amd64.gz
RUN apk add --no-cache curl RUN apk add --no-cache curl
RUN curl -sL $WEBPROC_URL | gzip -d - > /usr/local/bin/webproc RUN curl -sL $WEBPROCURL | gzip -d - > /usr/local/bin/webproc
RUN chmod +x /usr/local/bin/webproc RUN chmod +x /usr/local/bin/webproc
FROM build as dnsmasq FROM build as dnsmasq
RUN apk --no-cache add dnsmasq RUN apk --no-cache add dnsmasq
COPY --from=webproc /usr/local/bin/webproc /usr/local/bin/webproc COPY --from=webproc /usr/local/bin/webproc /usr/local/bin/webproc
ENTRYPOINT ["webproc","--on-exit","restart","--config","/etc/dnsmasq.conf,/etc/hosts,/etc/resolv.conf","--","dnsmasq","-k","--log-facility=-"] ENTRYPOINT ["webproc","-o","restart","-c","/etc/dnsmasq.conf","-c","/etc/hosts","-c","/etc/resolv.conf","--","dnsmasq","-k","--log-facility=-"]
EXPOSE 53/udp 8080 EXPOSE 53/udp 8080