mirror of
https://github.com/flant/ovpn-admin.git
synced 2026-02-04 09:12:13 -08:00
Compare commits
18 Commits
36dac9072a
...
70552c657e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70552c657e | ||
|
|
3b7b53ff24 | ||
|
|
0c0265e31d | ||
|
|
671b408b11 | ||
|
|
26372556b8 | ||
|
|
63b219d3e3 | ||
|
|
a067eab80e | ||
|
|
0df7679239 | ||
|
|
7331d87ab0 | ||
|
|
08925cf9b1 | ||
|
|
e24d02ac12 | ||
|
|
ca962491b6 | ||
|
|
f2675036f3 | ||
|
|
4412836db6 | ||
|
|
8bab06fa37 | ||
|
|
3f50da8036 | ||
|
|
9f746228b1 | ||
|
|
2c52c0a4f6 |
7
.github/workflows/publish-tag.yaml
vendored
7
.github/workflows/publish-tag.yaml
vendored
@ -12,6 +12,7 @@ on:
|
|||||||
env:
|
env:
|
||||||
WERF_STAGED_DOCKERFILE_VERSION: v2
|
WERF_STAGED_DOCKERFILE_VERSION: v2
|
||||||
WERF_BUILDAH_MODE: auto
|
WERF_BUILDAH_MODE: auto
|
||||||
|
WERF_ENV: ${{ (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && 'release' || 'pr' }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@ -30,7 +31,7 @@ jobs:
|
|||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
with:
|
with:
|
||||||
platforms: linux/amd64, linux/arm64
|
platforms: linux/amd64, linux/arm64, linux/arm/v7, linux/arm/v8
|
||||||
|
|
||||||
- name: Login into ghcr.io
|
- name: Login into ghcr.io
|
||||||
shell: bash
|
shell: bash
|
||||||
@ -47,7 +48,7 @@ jobs:
|
|||||||
source "$(werf ci-env github --as-file)"
|
source "$(werf ci-env github --as-file)"
|
||||||
source <(jq -r '.labels | to_entries | to_entries[] | "export WERF_EXPORT_ADD_LABEL_\(.key)=\"\(.value.key)=\(.value.value)\""' <<< $DOCKER_METADATA_OUTPUT_JSON)
|
source <(jq -r '.labels | to_entries | to_entries[] | "export WERF_EXPORT_ADD_LABEL_\(.key)=\"\(.value.key)=\(.value.value)\""' <<< $DOCKER_METADATA_OUTPUT_JSON)
|
||||||
|
|
||||||
werf build --repo='' --final-repo='' --secondary-repo "$WERF_REPO"
|
werf build --repo='' --final-repo='' --secondary-repo "$WERF_REPO" --env "$WERF_ENV"
|
||||||
|
|
||||||
- name: Build and Push Image
|
- name: Build and Push Image
|
||||||
if: ${{ github.event_name != 'pull_request' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
@ -55,4 +56,4 @@ jobs:
|
|||||||
source "$(werf ci-env github --as-file)"
|
source "$(werf ci-env github --as-file)"
|
||||||
source <(jq -r '.labels | to_entries | to_entries[] | "export WERF_EXPORT_ADD_LABEL_\(.key)=\"\(.value.key)=\(.value.value)\""' <<< $DOCKER_METADATA_OUTPUT_JSON)
|
source <(jq -r '.labels | to_entries | to_entries[] | "export WERF_EXPORT_ADD_LABEL_\(.key)=\"\(.value.key)=\(.value.value)\""' <<< $DOCKER_METADATA_OUTPUT_JSON)
|
||||||
|
|
||||||
werf export --tag ghcr.io/${{ github.repository }}/%image%:${{ github.ref_name }}
|
werf export --tag ghcr.io/${{ github.repository }}/%image%:${{ github.ref_name }} --env "$WERF_ENV"
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
FROM node:16-alpine3.15 AS frontend-builder
|
FROM node:19-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
|
||||||
|
|
||||||
|
|||||||
6165
frontend/package-lock.json
generated
6165
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -10,7 +10,7 @@
|
|||||||
"build": "cross-env NODE_ENV=production webpack --progress"
|
"build": "cross-env NODE_ENV=production webpack --progress"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"axios": "^0.27.1",
|
"axios": "^0.28.0",
|
||||||
"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",
|
||||||
@ -41,7 +41,7 @@
|
|||||||
"terser-webpack-plugin": "^5.3.0",
|
"terser-webpack-plugin": "^5.3.0",
|
||||||
"vue-loader": "^17.0.0",
|
"vue-loader": "^17.0.0",
|
||||||
"vue-template-compiler": "^2.6.14",
|
"vue-template-compiler": "^2.6.14",
|
||||||
"webpack": "^5.65.0",
|
"webpack": "^5.98.0",
|
||||||
"webpack-cli": "^4.9.1",
|
"webpack-cli": "^4.9.1",
|
||||||
"webpack-dev-server": "^4.7.2"
|
"webpack-dev-server": "^4.7.2"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,8 +3,11 @@ configVersion: 1
|
|||||||
build:
|
build:
|
||||||
platform:
|
platform:
|
||||||
- linux/amd64
|
- linux/amd64
|
||||||
# TODO(nabokihms): build multiplatform images only for the master branch
|
{{- if eq .Env "release" }}
|
||||||
# - linux/arm64
|
- linux/arm64
|
||||||
|
- linux/arm/v7
|
||||||
|
- linux/arm/v8
|
||||||
|
{{- end }}
|
||||||
staged: true
|
staged: true
|
||||||
---
|
---
|
||||||
image: ovpn-admin
|
image: ovpn-admin
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user