Compare commits

..

4 Commits

Author SHA1 Message Date
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
7 changed files with 12 additions and 10 deletions

View File

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

View File

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

View File

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

View File

@ -2,7 +2,7 @@ FROM node:16-alpine3.15 AS frontend-builder
COPY ../frontend /app COPY ../frontend /app
RUN apk add --update python3 make g++ && cd /app && npm install && npm run build 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 RUN go install github.com/gobuffalo/packr/v2/packr2@latest
COPY --from=frontend-builder /app/static /app/frontend/static COPY --from=frontend-builder /app/static /app/frontend/static
COPY .. /app COPY .. /app

View File

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

View File

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

View File

@ -1,3 +1,5 @@
#!/usr/bin/env bash #!/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 docker compose -p openvpn-master up -d --build