Merge pull request #69 from leojonathanoh/enhancement/bump-openvpn-2.…

…5.8-variants-to-2.5.10-openvpn-2.6.8-variants-to-2.6.11-and-openvpn-2.6.11-variants-to-2.6.12 Enhancement: Bump openvpn 2.5.8 variants to 2.5.10, openvpn 2.6.8 variants to 2.6.11, and openvpn 2.6.11 variants to 2.6.12
theohbrothers · Jul 27, 2024 · 9d450c6 · 9d450c6
2 parents 23a9260 + 8a1ccc3
commit 9d450c6
Show file tree

Hide file tree

Showing 21 changed files with 2,098 additions and 70 deletions.
diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
@@ -33,7 +33,7 @@ jobs:
       run: |
         git diff --exit-code
 
-  build-2-6-10:
+  build-2-6-12:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
@@ -64,9 +64,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-2.6.10-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-2.6.12-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-buildx-2.6.10-
+          ${{ runner.os }}-buildx-2.6.12-
           ${{ runner.os }}-buildx-
 
     - name: Login to Docker Hub registry
@@ -79,7 +79,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-6-10-alpine-edge
+      id: prep-2-6-12-alpine-edge
       run: |
         set -e
 
@@ -92,7 +92,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.6.10-alpine-edge"
+        VARIANT="2.6.12-alpine-edge"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -102,45 +102,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.6.10-alpine-edge - Build (PRs)
+    - name: 2.6.12-alpine-edge - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.10-alpine-edge
+        context: variants/2.6.12-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.6.10-alpine-edge - Build and push (master)
+    - name: 2.6.12-alpine-edge - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.10-alpine-edge
+        context: variants/2.6.12-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.6.10-alpine-edge - Build and push (release)
+    - name: 2.6.12-alpine-edge - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.10-alpine-edge
+        context: variants/2.6.12-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_SHA_VARIANT }}
           ${{ github.repository }}:latest
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
@@ -153,7 +153,7 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-6-8:
+  build-2-6-11:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
@@ -184,9 +184,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-2.6.8-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-2.6.11-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-buildx-2.6.8-
+          ${{ runner.os }}-buildx-2.6.11-
           ${{ runner.os }}-buildx-
 
     - name: Login to Docker Hub registry
@@ -199,7 +199,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-6-8-alpine-3-18
+      id: prep-2-6-11-alpine-3-18
       run: |
         set -e
 
@@ -212,7 +212,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.6.8-alpine-3.18"
+        VARIANT="2.6.11-alpine-3.18"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -222,45 +222,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.6.8-alpine-3.18 - Build (PRs)
+    - name: 2.6.11-alpine-3.18 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.8-alpine-3.18
+        context: variants/2.6.11-alpine-3.18
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.6.8-alpine-3.18 - Build and push (master)
+    - name: 2.6.11-alpine-3.18 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.8-alpine-3.18
+        context: variants/2.6.11-alpine-3.18
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.6.8-alpine-3.18 - Build and push (release)
+    - name: 2.6.11-alpine-3.18 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.8-alpine-3.18
+        context: variants/2.6.11-alpine-3.18
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -272,7 +272,7 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-5-8:
+  build-2-5-10:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
@@ -303,9 +303,9 @@ jobs:
       uses: actions/cache@v4
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-2.5.8-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-2.5.10-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-buildx-2.5.8-
+          ${{ runner.os }}-buildx-2.5.10-
           ${{ runner.os }}-buildx-
 
     - name: Login to Docker Hub registry
@@ -318,7 +318,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-5-8-alpine-3-17
+      id: prep-2-5-10-alpine-3-17
       run: |
         set -e
 
@@ -331,7 +331,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.5.8-alpine-3.17"
+        VARIANT="2.5.10-alpine-3.17"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -341,45 +341,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.5.8-alpine-3.17 - Build (PRs)
+    - name: 2.5.10-alpine-3.17 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.5.8-alpine-3.17
+        context: variants/2.5.10-alpine-3.17
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.5.8-alpine-3.17 - Build and push (master)
+    - name: 2.5.10-alpine-3.17 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.5.8-alpine-3.17
+        context: variants/2.5.10-alpine-3.17
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.5.8-alpine-3.17 - Build and push (release)
+    - name: 2.5.10-alpine-3.17 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.5.8-alpine-3.17
+        context: variants/2.5.10-alpine-3.17
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -1323,9 +1323,9 @@ jobs:
 
   update-draft-release:
     needs:
-      - build-2-6-10
-      - build-2-6-8
-      - build-2-5-8
+      - build-2-6-12
+      - build-2-6-11
+      - build-2-5-10
       - build-2-4-12
       - build-2-4-11
       - build-2-4-6
@@ -1344,9 +1344,9 @@ jobs:
 
   publish-draft-release:
     needs:
-      - build-2-6-10
-      - build-2-6-8
-      - build-2-5-8
+      - build-2-6-12
+      - build-2-6-11
+      - build-2-5-10
       - build-2-4-12
       - build-2-4-11
       - build-2-4-6
@@ -1367,9 +1367,9 @@ jobs:
 
   update-dockerhub-description:
     needs:
-      - build-2-6-10
-      - build-2-6-8
-      - build-2-5-8
+      - build-2-6-12
+      - build-2-6-11
+      - build-2-5-10
       - build-2-4-12
       - build-2-4-11
       - build-2-4-6

diff --git a/README.md b/README.md
@@ -12,9 +12,9 @@ Dockerized `openvpn`.
 
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
-| `:2.6.10-alpine-edge`, `:latest` | [View](variants/2.6.10-alpine-edge) |
-| `:2.6.8-alpine-3.18` | [View](variants/2.6.8-alpine-3.18) |
-| `:2.5.8-alpine-3.17` | [View](variants/2.5.8-alpine-3.17) |
+| `:2.6.12-alpine-edge`, `:latest` | [View](variants/2.6.12-alpine-edge) |
+| `:2.6.11-alpine-3.18` | [View](variants/2.6.11-alpine-3.18) |
+| `:2.5.10-alpine-3.17` | [View](variants/2.5.10-alpine-3.17) |
 | `:2.4.12-alpine-3.12` | [View](variants/2.4.12-alpine-3.12) |
 | `:2.4.11-alpine-3.11` | [View](variants/2.4.11-alpine-3.11) |
 | `:2.4.11-alpine-3.10` | [View](variants/2.4.11-alpine-3.10) |
@@ -38,7 +38,7 @@ It is assumed that you have knowledge of configuring `openvpn`. If needed, refer
 To run the image, at the least you should mount a `/etc/openvpn/server.conf`, which may be a unified openvpn profile (see INLINE FILE SUPPORT section in the [openvpn manual](https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage)).
 
 ```sh
-docker run --rm -it --cap-add NET_ADMIN -v /path/to/server.conf:/etc/openvpn/server.conf theohbrothers/docker-openvpn:2.6.10-alpine-edge
+docker run --rm -it --cap-add NET_ADMIN -v /path/to/server.conf:/etc/openvpn/server.conf theohbrothers/docker-openvpn:2.6.12-alpine-edge
 ```
 
 ## Environment variables

diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -2,7 +2,7 @@
 $local:VARIANTS_MATRIX = @(
     @{
         package = 'openvpn'
-        package_version = '2.6.10'
+        package_version = '2.6.12'
         distro = 'alpine'
         distro_version = 'edge'
         subvariants = @(
@@ -11,7 +11,7 @@ $local:VARIANTS_MATRIX = @(
     }
     @{
         package = 'openvpn'
-        package_version = '2.6.8'
+        package_version = '2.6.11'
         distro = 'alpine'
         distro_version = '3.18'
         subvariants = @(
@@ -20,7 +20,7 @@ $local:VARIANTS_MATRIX = @(
     }
     @{
         package = 'openvpn'
-        package_version = '2.5.8'
+        package_version = '2.5.10'
         distro = 'alpine'
         distro_version = '3.17'
         subvariants = @(

diff --git a/variants/2.5.10-alpine-3.17/Dockerfile b/variants/2.5.10-alpine-3.17/Dockerfile
@@ -0,0 +1,11 @@
+FROM alpine:3.17
+
+RUN set -eux; \
+    apk add --no-cache openvpn~=2.5.10 iptables; \
+    # Workaround openvpn --version exiting with non-zero exit code on openvpn <= 2.4.x
+    openvpn --version | grep -A100 -B100 2.5.10
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+
+ENTRYPOINT ["/docker-entrypoint.sh"]