Merge 08c893e5c26b62e9da592828a10224df6d2c6779 into ee618772c31787df292e01c7051f36597b943b50

.github/workflows/publish-tag.yaml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ jobs:
         goarch: ["386", "amd64"]
     steps:
       - name: checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: build binaries
         uses: wangyoucao577/go-release-action@v1.53
         with:

.github/workflows/release_arm.yaml

@@ -15,7 +15,7 @@ jobs:
         goarch: ["arm", "arm64"]
     steps:
       - name: checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: build binaries
         uses: wangyoucao577/go-release-action@v1.53
         with:

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.1-bullseye AS backend-builder
+FROM golang:1.23.6-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:

frontend/package-lock.json

@@ -8,7 +8,7 @@
       "version": "1.0.1a",
       "license": "MIT",
       "dependencies": {
-        "axios": "^1.8.2",
+        "axios": "^0.28.0",
         "bootstrap-vue": "^2.22.0",
         "normalize.css": "^8.0.1",
         "vue": "^2.6.14",
@@ -2448,12 +2448,12 @@
       "dev": true
     },
     "node_modules/axios": {
-      "version": "1.8.2",
+      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.0.tgz",
-      "integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==",
+      "integrity": "sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.6",
+        "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }

frontend/package.json

@@ -10,7 +10,7 @@
     "build": "cross-env NODE_ENV=production webpack --progress"
   },
   "dependencies": {
-    "axios": "^1.8.2",
+    "axios": "^0.28.0",
     "bootstrap-vue": "^2.22.0",
     "normalize.css": "^8.0.1",
     "vue": "^2.6.14",

start.sh

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 
-# About 'docker compose' and 'docker-compose'
-# We are using Docker Compose in plugin mode with Docker. For more details, see: https://docs.docker.com/compose/install/linux/. If you need to use the standalone Docker Compose, you can modify the command `docker compose` to `docker-compose` accordingly.
 docker compose -p openvpn-master up -d --build