Merge pull request #51 from theohbrothers/enhancement/bump-ansible-8-…

…variants-to-8.6.1 Enhancement: Bump ansible 8 variants to 8.6.1
theohbrothers · Dec 7, 2023 · 90a8cfa · 90a8cfa
2 parents 0cb8bae + 98c5242
commit 90a8cfa
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 39 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-8-4-0:
+  build-8-6-1:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
@@ -64,9 +64,9 @@ jobs:
       uses: actions/cache@v3
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-8.4.0-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-8.6.1-${{ github.sha }}
         restore-keys: |
-          ${{ runner.os }}-buildx-8.4.0-
+          ${{ runner.os }}-buildx-8.6.1-
           ${{ runner.os }}-buildx-
 
     - name: Login to Docker Hub registry
@@ -79,7 +79,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-8-4-0-alpine-edge
+      id: prep-8-6-1-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="8.4.0-alpine-edge"
+        VARIANT="8.6.1-alpine-edge"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -102,52 +102,52 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 8.4.0-alpine-edge - Build (PRs)
+    - name: 8.6.1-alpine-edge - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/8.4.0-alpine-edge
+        context: variants/8.6.1-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-4-0-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-4-0-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-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: 8.4.0-alpine-edge - Build and push (master)
+    - name: 8.6.1-alpine-edge - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/8.4.0-alpine-edge
+        context: variants/8.6.1-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-4-0-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-4-0-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-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: 8.4.0-alpine-edge - Build and push (release)
+    - name: 8.6.1-alpine-edge - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/8.4.0-alpine-edge
+        context: variants/8.6.1-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-4-0-alpine-edge.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-4-0-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-4-0-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-alpine-edge.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-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
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-8-4-0-sops-ssh-alpine-edge
+      id: prep-8-6-1-sops-ssh-alpine-edge
       run: |
         set -e
 
@@ -160,7 +160,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="8.4.0-sops-ssh-alpine-edge"
+        VARIANT="8.6.1-sops-ssh-alpine-edge"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -170,45 +170,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 8.4.0-sops-ssh-alpine-edge - Build (PRs)
+    - name: 8.6.1-sops-ssh-alpine-edge - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/8.4.0-sops-ssh-alpine-edge
+        context: variants/8.6.1-sops-ssh-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-4-0-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-4-0-sops-ssh-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-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: 8.4.0-sops-ssh-alpine-edge - Build and push (master)
+    - name: 8.6.1-sops-ssh-alpine-edge - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/8.4.0-sops-ssh-alpine-edge
+        context: variants/8.6.1-sops-ssh-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-4-0-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-4-0-sops-ssh-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-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: 8.4.0-sops-ssh-alpine-edge - Build and push (release)
+    - name: 8.6.1-sops-ssh-alpine-edge - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/8.4.0-sops-ssh-alpine-edge
+        context: variants/8.6.1-sops-ssh-alpine-edge
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-4-0-sops-ssh-alpine-edge.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-4-0-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-4-0-sops-ssh-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-edge.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-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
 
@@ -2268,7 +2268,7 @@ jobs:
 
   update-draft-release:
     needs:
-      - build-8-4-0
+      - build-8-6-1
       - build-7-5-0
       - build-6-6-0
       - build-5-8-0
@@ -2293,7 +2293,7 @@ jobs:
 
   publish-draft-release:
     needs:
-      - build-8-4-0
+      - build-8-6-1
       - build-7-5-0
       - build-6-6-0
       - build-5-8-0
@@ -2320,7 +2320,7 @@ jobs:
 
   update-dockerhub-description:
     needs:
-      - build-8-4-0
+      - build-8-6-1
       - build-7-5-0
       - build-6-6-0
       - build-5-8-0

diff --git a/README.md b/README.md
@@ -10,8 +10,8 @@ Dockerized `ansible` with useful tools.
 
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
-| `:8.4.0-alpine-edge`, `:latest` | [View](variants/8.4.0-alpine-edge) |
-| `:8.4.0-sops-ssh-alpine-edge` | [View](variants/8.4.0-sops-ssh-alpine-edge) |
+| `:8.6.1-alpine-edge`, `:latest` | [View](variants/8.6.1-alpine-edge) |
+| `:8.6.1-sops-ssh-alpine-edge` | [View](variants/8.6.1-sops-ssh-alpine-edge) |
 | `:7.5.0-alpine-3.18` | [View](variants/7.5.0-alpine-3.18) |
 | `:7.5.0-sops-ssh-alpine-3.18` | [View](variants/7.5.0-sops-ssh-alpine-3.18) |
 | `:6.6.0-alpine-3.17` | [View](variants/6.6.0-alpine-3.17) |

diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -5,7 +5,7 @@
 $local:VARIANTS_MATRIX = @(
     @{
         package = 'ansible'
-        package_version = '8.4.0'
+        package_version = '8.6.1'
         distro = 'alpine'
         distro_version = 'edge'
         subvariants = @(

diff --git a/variants/8.6.1-alpine-edge/Dockerfile b/variants/8.6.1-alpine-edge/Dockerfile
@@ -0,0 +1,16 @@
+FROM alpine:edge
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=8.6.1; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/8.6.1-alpine-edge/docker-entrypoint.sh b/variants/8.6.1-alpine-edge/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
diff --git a/variants/8.6.1-sops-ssh-alpine-edge/Dockerfile b/variants/8.6.1-sops-ssh-alpine-edge/Dockerfile
@@ -0,0 +1,26 @@
+FROM alpine:edge
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=8.6.1; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/8.6.1-sops-ssh-alpine-edge/docker-entrypoint.sh b/variants/8.6.1-sops-ssh-alpine-edge/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"