.github/dependabot.yml

@@ -12,7 +12,7 @@ updates:
     schedule:
       interval: "weekly"
 
-  # Dependencies listed in Dockerfile
+  # Dependencies listed in Dockerfile.ovpn-admin
   - package-ecosystem: "docker"
     directory: "/"
     schedule:

.github/workflows/publish-tag.yaml

@@ -9,14 +9,16 @@ on:
     branches:
       - master
 
-env:
-  WERF_STAGED_DOCKERFILE_VERSION: v2
-  # WERF_BUILDAH_MODE: auto
-
 jobs:
   build:
     name: build images for tag
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - name: ovpn-admin
+        - name: openvpn
 
     steps:
       - name: Checkout code
@@ -24,29 +26,40 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: werf/actions/install@v1.2
+      - name: Get the version
+        id: get_version
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
-      - name: Login into ghcr.io
+      - name: Set up Docker Buildx
-        shell: bash
+        uses: docker/setup-buildx-action@v2
-        run: werf cr login -u ${{ github.actor }} -p ${{ github.token }} ghcr.io/${{ github.repository }}
 
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3.3.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.DECKHOUSE_REGISTRY_USER }}
+          password: ${{ secrets.DECKHOUSE_REGISTRY_PASSWORD }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
+        id: meta
         uses: docker/metadata-action@v5.6.1
         with:
           images: ghcr.io/${{ github.repository }}/${{ matrix.name }}
 
-      - name: Build Image
+      # Build and push Docker image with Buildx (don't push on PR)
-        if: ${{ github.event_name == 'pull_request' }}
+      # https://github.com/docker/build-push-action
-        run: |
+      - name: Push Image
-          source "$(werf ci-env github --as-file)"
+        uses: docker/build-push-action@v4
-          source <(jq -r '.labels | to_entries | to_entries[] | "export WERF_EXPORT_ADD_LABEL_\(.key)=\"\(.value.key)=\(.value.value)\""' <<< $DOCKER_METADATA_OUTPUT_JSON)
+        with:
-
+          push: ${{ github.event_name != 'pull_request' }}
-          werf build
+          tags: ${{ steps.meta.outputs.tags }}
-
+          labels: ${{ steps.meta.outputs.labels }}
-      - name: Build and Push Image
+          build-args: |
-        if: ${{ github.event_name != 'pull_request' }}
+            TAG=${{ github.ref_name }}
-        run: |
+          platforms: linux/amd64,linux/arm64,linux/arm
-          source "$(werf ci-env github --as-file)"
+          file: ./Dockerfile.${{ matrix.name }}
-          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 }}

Dockerfile.ovpn-admin

@@ -17,4 +17,4 @@ RUN apk add --update bash easy-rsa openssl openvpn coreutils  && \
     ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
     wget https://github.com/pashcovich/openvpn-user/releases/download/v1.0.4/openvpn-user-linux-${TARGETARCH}.tar.gz -O - | tar xz -C /usr/local/bin && \
     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