Merge f5dd97cf95a4037f2418a395f0cae1a7b0749544 into 540b5836b2575f86f8d30cffb83a1a220ed7873e

This commit is contained in:
Maksim Nabokikh 2025-03-04 13:11:45 +00:00 committed by GitHub
commit 262063dfc8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 4 deletions

View File

@ -11,12 +11,12 @@ on:
env: env:
WERF_STAGED_DOCKERFILE_VERSION: v2 WERF_STAGED_DOCKERFILE_VERSION: v2
# WERF_BUILDAH_MODE: auto WERF_BUILDAH_MODE: auto
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 +24,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
- name: Login into ghcr.io - name: Login into ghcr.io
shell: bash shell: bash

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/* 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

View File

@ -1,5 +1,10 @@
project: ovpn-admin project: ovpn-admin
configVersion: 1 configVersion: 1
build:
platform:
- linux/amd64
- linux/arm64
staged: true
--- ---
image: ovpn-admin image: ovpn-admin
dockerfile: Dockerfile.ovpn-admin dockerfile: Dockerfile.ovpn-admin