Merge b6be65b7981c4ca8f9a78b217b0a9ff516436e65 into f25d6e30cb8866109d4f8c8f5c9dadaef90f5fb2

Dockerfile.ovpn-admin

@@ -2,7 +2,7 @@ FROM node:16-alpine3.15 AS frontend-builder
 COPY ../frontend /app
 RUN apk add --update python3 make g++ && cd /app && npm install && npm run build
 
-FROM golang:1.24.2-bullseye AS backend-builder
+FROM golang:1.24.1-bullseye AS backend-builder
 RUN go install github.com/gobuffalo/packr/v2/packr2@latest
 COPY --from=frontend-builder /app/static /app/frontend/static
 COPY .. /app

docker-compose.yaml

@@ -22,7 +22,6 @@ services:
   ovpn-admin:
     build:
       context: .
-      dockerfile: Dockerfile.ovpn-admin
     image: ovpn-admin:local
     command: /app/ovpn-admin
     environment:

setup/configure.sh

@@ -21,10 +21,10 @@ else
     done
   else
     echo "Generating new certs"
-    easyrsa --batch init-pki
+    easyrsa init-pki
     cp -R /usr/share/easy-rsa/* $EASY_RSA_LOC/pki
     echo "ca" | easyrsa build-ca nopass
-    easyrsa --batch build-server-full server nopass
+    easyrsa build-server-full server nopass
     easyrsa gen-dh
     openvpn --genkey --secret ./pki/ta.key
   fi