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

Merge pull request #1 from luketainton/upgrade

Browse Source 
Update alpine and webproc, create automated build workflow
This commit is contained in:
David Chidell 2021-10-19 13:03:48 +01:00 committed by GitHub
commit 2b67d20176
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/build.yml vendored Normal file
View File

@ -0,0 +1,18 @@
name: Build Docker Image
on:
push:
branches: master
jobs:
build:
name: Push to GHCR
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Login
run: echo ${{ secrets.GHCR_PAT }} | docker login ghcr.io -u dchidell --password-stdin
- name: Build
run: docker build . --file Dockerfile --tag ghcr.io/dchidell/dnsmasq-web:latest
- name: Push
run: |
docker push ghcr.io/dchidell/dnsmasq-web:latest

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