Compare commits

..

No commits in common. "3b7b53ff24d4e64edbaa6050621088d4db75a7c4" and "540b5836b2575f86f8d30cffb83a1a220ed7873e" have entirely different histories.

5 changed files with 2220 additions and 4699 deletions

View File

@ -11,13 +11,12 @@ on:
env:
WERF_STAGED_DOCKERFILE_VERSION: v2
WERF_BUILDAH_MODE: auto
WERF_ENV: ${{ (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && 'release' || 'pr' }}
# WERF_BUILDAH_MODE: auto
jobs:
build:
name: build images for tag
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout code
@ -25,13 +24,7 @@ jobs:
with:
fetch-depth: 0
- 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
- uses: werf/actions/install@v1.2
- name: Login into ghcr.io
shell: bash
@ -48,7 +41,7 @@ jobs:
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)
werf build --repo='' --final-repo='' --secondary-repo "$WERF_REPO" --env "$WERF_ENV"
werf build --repo='' --final-repo='' --secondary-repo "$WERF_REPO"
- name: Build and Push Image
if: ${{ github.event_name != 'pull_request' }}
@ -56,4 +49,4 @@ jobs:
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)
werf export --tag ghcr.io/${{ github.repository }}/%image%:${{ github.ref_name }} --env "$WERF_ENV"
werf export --tag ghcr.io/${{ github.repository }}/%image%:${{ github.ref_name }}

View File

@ -6,4 +6,4 @@ RUN apk add --update bash openvpn easy-rsa iptables && \
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
COPY setup/ /etc/openvpn/setup
RUN chmod +x /etc/openvpn/setup/configure.sh
RUN chmod +x /etc/openvpn/setup/configure.sh

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,7 @@
"build": "cross-env NODE_ENV=production webpack --progress"
},
"dependencies": {
"axios": "^0.28.0",
"axios": "^0.27.1",
"bootstrap-vue": "^2.22.0",
"normalize.css": "^8.0.1",
"vue": "^2.6.14",
@ -41,7 +41,7 @@
"terser-webpack-plugin": "^5.3.0",
"vue-loader": "^17.0.0",
"vue-template-compiler": "^2.6.14",
"webpack": "^5.98.0",
"webpack": "^5.65.0",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.7.2"
}

View File

@ -1,14 +1,5 @@
project: ovpn-admin
configVersion: 1
build:
platform:
- linux/amd64
{{- if eq .Env "release" }}
- linux/arm64
- linux/arm/v7
- linux/arm/v8
{{- end }}
staged: true
---
image: ovpn-admin
dockerfile: Dockerfile.ovpn-admin