diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 96de918..3fc2925 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -147,7 +147,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -160,7 +160,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.30.3-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq" 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: 1.30.3-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.30.3-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.30.3-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-30-3-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -333,7 +333,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -346,7 +346,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.29.7-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -356,45 +356,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.29.7-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.29.7-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.29.7-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-29-7-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -519,7 +519,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -532,7 +532,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.28.12-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -542,45 +542,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.28.12-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.28.12-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.28.12-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-28-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -705,7 +705,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -718,7 +718,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.27.16-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -728,45 +728,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.27.16-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.27.16-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.27.16-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-27-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -891,7 +891,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -904,7 +904,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.26.15-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -914,45 +914,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.26.15-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.26.15-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.26.15-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-26-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -1077,7 +1077,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -1090,7 +1090,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.25.16-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -1100,45 +1100,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-25-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -1263,7 +1263,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -1276,7 +1276,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.24.17-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -1286,45 +1286,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.24.17-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.24.17-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.24.17-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-24-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -1449,7 +1449,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -1462,7 +1462,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.23.17-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -1472,45 +1472,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.23.17-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.23.17-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.23.17-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-23-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -1635,7 +1635,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -1648,7 +1648,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.22.17-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -1658,45 +1658,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.22.17-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.22.17-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.22.17-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-22-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -1821,7 +1821,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -1834,7 +1834,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.21.14-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -1844,45 +1844,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.21.14-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.21.14-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.21.14-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-21-14-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -2007,7 +2007,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -2020,7 +2020,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.20.15-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -2030,45 +2030,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.20.15-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.20.15-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.20.15-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-20-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -2193,7 +2193,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -2206,7 +2206,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.19.16-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -2216,45 +2216,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.19.16-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.19.16-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.19.16-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-19-16-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -2379,7 +2379,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -2392,7 +2392,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.18.20-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -2402,45 +2402,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.18.20-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.18.20-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.18.20-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-18-20-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -2565,7 +2565,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -2578,7 +2578,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.17.17-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -2588,45 +2588,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.17.17-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.17.17-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.17.17-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-17-17-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -2751,7 +2751,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -2764,7 +2764,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.16.15-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -2774,45 +2774,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.16.15-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.16.15-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.16.15-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-16-15-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -2937,7 +2937,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -2950,7 +2950,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.15.12-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -2960,45 +2960,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.15.12-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.15.12-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.15.12-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-15-12-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max @@ -3123,7 +3123,7 @@ jobs: # This step generates the docker tags - name: Prepare - id: prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh + id: prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh-yq run: | set -e @@ -3136,7 +3136,7 @@ jobs: # Generate docker image tags # E.g. 'v0.0.0-' and 'v0.0.0-abc0123-' # E.g. 'master-' and 'master-abc0123-' - VARIANT="1.14.10-envsubst-git-jq-kustomize-sops-ssh" + VARIANT="1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq" REF_VARIANT="${REF}-${VARIANT}" REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}" @@ -3146,45 +3146,45 @@ jobs: echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT - - name: 1.14.10-envsubst-git-jq-kustomize-sops-ssh - Build (PRs) + - name: 1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq - Build (PRs) # Run only on pull requests if: github.event_name == 'pull_request' uses: docker/build-push-action@v5 with: - context: variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: false tags: | - ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.14.10-envsubst-git-jq-kustomize-sops-ssh - Build and push (master) + - name: 1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (master) # Run only on master if: github.ref == 'refs/heads/master' uses: docker/build-push-action@v5 with: - context: variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - - name: 1.14.10-envsubst-git-jq-kustomize-sops-ssh - Build and push (release) + - name: 1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq - Build and push (release) if: startsWith(github.ref, 'refs/tags/') uses: docker/build-push-action@v5 with: - context: variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh + context: variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x push: true tags: | - ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh.outputs.VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_VARIANT }} - ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh.outputs.REF_SHA_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_VARIANT }} + ${{ github.repository }}:${{ steps.prep-1-14-10-envsubst-git-jq-kustomize-sops-ssh-yq.outputs.REF_SHA_VARIANT }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max diff --git a/README.md b/README.md index 6f03021..5086287 100644 --- a/README.md +++ b/README.md @@ -11,39 +11,39 @@ Dockerized `kubectl` with useful tools. | Tag | Dockerfile Build Context | |:-------:|:---------:| | `:1.30.3`, `:latest` | [View](variants/1.30.3) | -| `:1.30.3-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.29.7` | [View](variants/1.29.7) | -| `:1.29.7-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.28.12` | [View](variants/1.28.12) | -| `:1.28.12-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.27.16` | [View](variants/1.27.16) | -| `:1.27.16-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.26.15` | [View](variants/1.26.15) | -| `:1.26.15-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.25.16` | [View](variants/1.25.16) | -| `:1.25.16-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.24.17` | [View](variants/1.24.17) | -| `:1.24.17-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.23.17` | [View](variants/1.23.17) | -| `:1.23.17-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.22.17` | [View](variants/1.22.17) | -| `:1.22.17-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.21.14` | [View](variants/1.21.14) | -| `:1.21.14-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.20.15` | [View](variants/1.20.15) | -| `:1.20.15-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.19.16` | [View](variants/1.19.16) | -| `:1.19.16-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.18.20` | [View](variants/1.18.20) | -| `:1.18.20-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.17.17` | [View](variants/1.17.17) | -| `:1.17.17-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.16.15` | [View](variants/1.16.15) | -| `:1.16.15-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.15.12` | [View](variants/1.15.12) | -| `:1.15.12-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq) | | `:1.14.10` | [View](variants/1.14.10) | -| `:1.14.10-envsubst-git-jq-kustomize-sops-ssh` | [View](variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh) | +| `:1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq` | [View](variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq) | All variants are based on `alpine`. diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1 index c7bb9a1..b73bdcb 100755 --- a/generate/definitions/VARIANTS.ps1 +++ b/generate/definitions/VARIANTS.ps1 @@ -9,7 +9,7 @@ $local:VARIANTS_MATRIX = @( distro_version = '3.15' subvariants = @( @{ components = @(); tag_as_latest = if ($v -eq ($local:VERSIONS.kubectl.versions | ? { $_ -match '^\d+\.\d+\.\d+$' } | Select-Object -First 1 )) { $true } else { $false } } - @{ components = @( 'envsubst', 'git', 'jq', 'kustomize', 'sops', 'ssh' ) } + @{ components = @( 'envsubst', 'git', 'jq', 'kustomize', 'sops', 'ssh', 'yq' ) } ) } } diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1 index 77efb68..d457a6d 100755 --- a/generate/templates/Dockerfile.ps1 +++ b/generate/templates/Dockerfile.ps1 @@ -97,30 +97,12 @@ RUN apk add --no-cache openssh-client '@ } - 'sockets' { + 'yq' { @' -# Sockets -# See: https://github.com/docker-library/php/issues/181#issuecomment-173365852 -RUN docker-php-ext-install sockets - - -'@ - - } - - 'xdebug' { - @' -# Xdebug: https://stackoverflow.com/questions/46825502/how-do-i-install-xdebug-on-dockers-official-php-fpm-alpine-image -# PHPIZE_DEPS: autoconf dpkg-dev dpkg file g++ gcc libc-dev make pkgconf re2c -RUN apk add --no-cache --virtual .build-dependencies $PHPIZE_DEPS \ - && pecl install xdebug \ - && docker-php-ext-enable xdebug \ - && docker-php-source delete \ - && apk del .build-dependencies +RUN apk add --no-cache jq '@ - } default { diff --git a/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..0f669cf --- /dev/null +++ b/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.14.10/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.14.10-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..fb66c5e --- /dev/null +++ b/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.15.12/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.15.12-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..f6c0cc2 --- /dev/null +++ b/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.16.15/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.16.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..923e4ce --- /dev/null +++ b/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.17.17/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.17.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..304bc23 --- /dev/null +++ b/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.18.20/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.18.20-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..5a2e99f --- /dev/null +++ b/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.19.16/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.19.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..de77f21 --- /dev/null +++ b/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.20.15/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.20.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..bc190d7 --- /dev/null +++ b/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.21.14/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.21.14-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..597a601 --- /dev/null +++ b/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.22.17/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.22.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..5175488 --- /dev/null +++ b/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.23.17/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.23.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..b573117 --- /dev/null +++ b/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.24.17/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.24.17-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..8dcb465 --- /dev/null +++ b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.25.16/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.25.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..6d36ad0 --- /dev/null +++ b/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.26.15/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.26.15-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..f6bc5bc --- /dev/null +++ b/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.27.16/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.27.16-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..52b7a35 --- /dev/null +++ b/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.28.12/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.28.12-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..c119c8f --- /dev/null +++ b/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.29.7/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.29.7-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file diff --git a/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile b/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile new file mode 100644 index 0000000..cf4acac --- /dev/null +++ b/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/Dockerfile @@ -0,0 +1,59 @@ +FROM alpine:3.15 +ARG TARGETPLATFORM +ARG BUILDPLATFORM +RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" + +RUN apk add --no-cache ca-certificates + +# When $TARGETPLATFORM is linux/arm/v7, strip out the '/v6' or '/v7' from it +RUN BIN_URL=https://storage.googleapis.com/kubernetes-release/release/v1.30.3/bin/$( echo $TARGETPLATFORM | sed 's@/v[67]$@@' )/kubectl \ + && SHA512=$( wget -qO- "$BIN_URL.sha512" ) \ + && wget -qO- "$BIN_URL" > /usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl \ + && sha512sum /usr/local/bin/kubectl | grep "^$SHA512 " \ + && kubectl version --client + +# From: https://github.com/nginxinc/docker-nginx/blob/1.17.0/stable/alpine/Dockerfile +# Bring in gettext so we can get `envsubst`, then throw +# the rest away. To do this, we need to install `gettext` +# then move `envsubst` out of the way so `gettext` can +# be deleted completely, then move `envsubst` back. +RUN apk add --no-cache --virtual .gettext gettext \ + && mv /usr/bin/envsubst /tmp/ \ + \ + && runDeps="$( \ + scanelf --needed --nobanner /tmp/envsubst \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | sort -u \ + | xargs -r apk info --installed \ + | sort -u \ + )" \ + && apk add --no-cache $runDeps \ + && apk del .gettext \ + && mv /tmp/envsubst /usr/local/bin/ + +RUN apk add --no-cache git + +RUN apk add --no-cache jq + +RUN apk add --no-cache curl \ + && curl -L https://github.com/kubernetes-sigs/kustomize/releases/download/v2.0.3/kustomize_2.0.3_linux_amd64 -o /usr/local/bin/kustomize \ + && chmod +x /usr/local/bin/kustomize \ + && apk del curl + +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 + +RUN apk add --no-cache jq + +COPY docker-entrypoint.sh /docker-entrypoint.sh +RUN chmod +x /docker-entrypoint.sh + +ENTRYPOINT [ "/docker-entrypoint.sh" ] diff --git a/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh b/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh new file mode 100644 index 0000000..2cbc6d4 --- /dev/null +++ b/variants/1.30.3-envsubst-git-jq-kustomize-sops-ssh-yq/docker-entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh +set -eu + +if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then + set -- kubectl "$@" +elif [ $# -gt 0 ] && kubectl "$1" --help > /dev/null 2>&1; then + set -- kubectl "$@" +fi + +exec "$@" \ No newline at end of file