Merge 08c893e5c26b62e9da592828a10224df6d2c6779 into 0fc701f2eb26cc04152992371ea69e255206acfe

Merge pull request #338 from naidu/patch-1
fixing docker-compose.yaml to point to right dockerfile
2026-02-04 01:10:22 -08:00 · 2025-03-28 16:22:00 +07:00 · 2025-03-28 16:19:26 +07:00 · 2025-03-23 08:35:12 +01:00 · 2025-03-23 08:34:21 +01:00 · 2025-03-23 08:33:30 +01:00
8 changed files with 13 additions and 10 deletions
--- a/.github/workflows/publish-tag.yaml
+++ b/.github/workflows/publish-tag.yaml
@ -21,7 +21,7 @@ jobs:

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

--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@ -15,7 +15,7 @@ jobs:
        goarch: ["386", "amd64"]
    steps:
      - name: checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      - name: build binaries
        uses: wangyoucao577/go-release-action@v1.53
        with:
--- a/.github/workflows/release_arm.yaml
+++ b/.github/workflows/release_arm.yaml
@ -15,7 +15,7 @@ jobs:
        goarch: ["arm", "arm64"]
    steps:
      - name: checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      - name: build binaries
        uses: wangyoucao577/go-release-action@v1.53
        with:
--- a/Dockerfile.ovpn-admin
+++ b/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.23.6-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
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -22,6 +22,7 @@ services:
  ovpn-admin:
    build:
      context: .
+      dockerfile: Dockerfile.ovpn-admin
    image: ovpn-admin:local
    command: /app/ovpn-admin
    environment:
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@ -8,7 +8,7 @@
      "version": "1.0.1a",
      "license": "MIT",
      "dependencies": {
-        "axios": "^0.28.0",
+        "axios": "^1.8.2",
        "bootstrap-vue": "^2.22.0",
        "normalize.css": "^8.0.1",
        "vue": "^2.6.14",
@ -2448,12 +2448,12 @@
      "dev": true
    },
    "node_modules/axios": {
-      "version": "0.28.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.28.0.tgz",
-      "integrity": "sha512-Tu7NYoGY4Yoc7I+Npf9HhUMtEEpV7ZiLH9yndTCoNhcpBH0kwcvFbzYN9/u5QKI5A6uefjsNNWaz5olJVYS62Q==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.2.tgz",
+      "integrity": "sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==",
      "license": "MIT",
      "dependencies": {
-        "follow-redirects": "^1.15.0",
+        "follow-redirects": "^1.15.6",
        "form-data": "^4.0.0",
        "proxy-from-env": "^1.1.0"
      }
--- a/frontend/package.json
+++ b/frontend/package.json
@ -10,7 +10,7 @@
    "build": "cross-env NODE_ENV=production webpack --progress"
  },
  "dependencies": {
-    "axios": "^0.28.0",
+    "axios": "^1.8.2",
    "bootstrap-vue": "^2.22.0",
    "normalize.css": "^8.0.1",
    "vue": "^2.6.14",
--- a/start.sh
+++ b/start.sh
@ -1,3 +1,5 @@
 #!/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
Author	SHA1	Message	Date
dependabot[bot]	8898e7a130	Merge 08c893e5c26b62e9da592828a10224df6d2c6779 into 0fc701f2eb26cc04152992371ea69e255206acfe	2025-03-28 16:22:00 +07:00
Dmitry Shurupov	0fc701f2eb	Merge pull request #338 from naidu/patch-1 fixing docker-compose.yaml to point to right dockerfile	2025-03-28 16:19:26 +07:00
dependabot[bot]	f25d6e30cb	Bump axios from 0.28.0 to 1.8.2 in /frontend (#339 ) Bumps [axios](https://github.com/axios/axios) from 0.28.0 to 1.8.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.28.0...v1.8.2) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-03-23 08:35:12 +01:00
dependabot[bot]	83e74ec351	Bump golang from 1.23.6-bullseye to 1.24.1-bullseye (#340 ) Bumps golang from 1.23.6-bullseye to 1.24.1-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-03-23 08:34:21 +01:00
xzxiaoshan	711bd120b9	Comment the docker-compose plugin (#349 ) Signed-off-by: xzxiaoshan <365384722@qq.com>	2025-03-23 08:33:30 +01:00
dependabot[bot]	29c68e74fe	Bump actions/checkout from 2 to 4 (#346 ) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-03-23 08:31:31 +01:00
BTR Naidu	eacd266124	fixing docker-compose.yaml to point to right dockerfile	2025-03-05 14:59:21 +01:00