mirror of
https://github.com/flant/ovpn-admin.git
synced 2026-02-04 09:12:13 -08:00
Compare commits
17 Commits
540b5836b2
...
3b7b53ff24
| Author | SHA1 | Date | |
|---|---|---|---|
|
3b7b53ff24 | ||
|
|
0c0265e31d | ||
|
|
671b408b11 | ||
|
|
26372556b8 | ||
|
|
63b219d3e3 | ||
|
a067eab80e | ||
|
|
0df7679239 | ||
|
|
7331d87ab0 | ||
|
|
08925cf9b1 | ||
|
|
e24d02ac12 | ||
|
|
ca962491b6 | ||
|
|
f2675036f3 | ||
|
|
4412836db6 | ||
|
|
8bab06fa37 | ||
|
|
3f50da8036 | ||
|
|
9f746228b1 | ||
|
|
f215e6f157 |
17
.github/workflows/publish-tag.yaml
vendored
17
.github/workflows/publish-tag.yaml
vendored
@ -11,12 +11,13 @@ 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:
|
||||||
name: build images for tag
|
name: build images for tag
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
@ -24,7 +25,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- uses: werf/actions/install@v1.2
|
- name: Install werf
|
||||||
|
uses: werf/actions/install@v2
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
with:
|
||||||
|
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
|
||||||
@ -41,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' }}
|
||||||
@ -49,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"
|
||||||
|
|||||||
@ -6,4 +6,4 @@ RUN apk add --update bash openvpn easy-rsa iptables && \
|
|||||||
rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
|
rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
|
||||||
RUN if [ -f "/usr/local/bin/openvpn-user-${TARGETARCH}" ]; then ln -s /usr/local/bin/openvpn-user-${TARGETARCH} /usr/local/bin/openvpn-user; fi
|
RUN if [ -f "/usr/local/bin/openvpn-user-${TARGETARCH}" ]; then ln -s /usr/local/bin/openvpn-user-${TARGETARCH} /usr/local/bin/openvpn-user; fi
|
||||||
COPY setup/ /etc/openvpn/setup
|
COPY setup/ /etc/openvpn/setup
|
||||||
RUN chmod +x /etc/openvpn/setup/configure.sh
|
RUN chmod +x /etc/openvpn/setup/configure.sh
|
||||||
|
|||||||
6961
frontend/package-lock.json
generated
6961
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"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,14 @@
|
|||||||
project: ovpn-admin
|
project: ovpn-admin
|
||||||
configVersion: 1
|
configVersion: 1
|
||||||
|
build:
|
||||||
|
platform:
|
||||||
|
- linux/amd64
|
||||||
|
{{- if eq .Env "release" }}
|
||||||
|
- linux/arm64
|
||||||
|
- linux/arm/v7
|
||||||
|
- linux/arm/v8
|
||||||
|
{{- end }}
|
||||||
|
staged: true
|
||||||
---
|
---
|
||||||
image: ovpn-admin
|
image: ovpn-admin
|
||||||
dockerfile: Dockerfile.ovpn-admin
|
dockerfile: Dockerfile.ovpn-admin
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user