From 864b31678ca6fe451cb2d8ccfeea3297b424fe06 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Mon, 18 Oct 2021 20:03:02 +0100
Subject: [PATCH] Update alpine and webproc, create automated build workflow

---
 .github/workflows/build.yml | 18 ++++++++++++++++++
 Dockerfile                  | 13 +++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..a1f211e
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -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/radius-web:latest
+    - name: Push
+      run: |
+        docker push ghcr.io/dchidell/radius-web:latest
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index e587c86..4be59be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,19 @@
-FROM alpine:3.11 as build
+FROM alpine:3.14 as build
 LABEL maintainer="David Chidell (dchidell@cisco.com)"
-ENV VERSION=201712190728
-ENV TAC_PLUS_BIN=/tacacs/sbin/tac_plus
 
 FROM build as webproc
-ENV WEBPROC_VERSION 0.2.2
-ENV WEBPROC_URL https://github.com/jpillora/webproc/releases/download/$WEBPROC_VERSION/webproc_linux_amd64.gz
+ENV WEBPROCVERSION 0.4.0
+ENV WEBPROCURL https://github.com/jpillora/webproc/releases/download/v$WEBPROCVERSION/webproc_"$WEBPROCVERSION"_linux_amd64.gz
 RUN apk add --no-cache curl
 RUN curl -sL $WEBPROC_URL | gzip -d - > /usr/local/bin/webproc
 RUN chmod +x /usr/local/bin/webproc
 
-FROM build as snmptrap
+FROM build as radius
 RUN apk --no-cache add freeradius
 COPY --from=webproc /usr/local/bin/webproc /usr/local/bin/webproc
-
 ADD clients.conf /etc/raddb/clients.conf
 ADD users /etc/raddb/users
 ADD radiusd.conf /etc/raddb/radiusd.conf
 RUN chmod -R o-w /etc/raddb/
-ENTRYPOINT ["webproc","--on-exit","restart","--config","/etc/raddb/users,/etc/raddb/clients.conf,/etc/raddb/radiusd.conf","--","radiusd","-f","-l","stdout"]
+ENTRYPOINT ["webproc","-o","restart","-c","/etc/raddb/users","-c", "/etc/raddb/clients.conf", "-c", "/etc/raddb/radiusd.conf","--","radiusd","-f","-l","stdout"]
 EXPOSE 1812/udp 8080