Merge pull request #89 from theohbrothers/enhancement/bump-terraform-…

…1.9-variants-to-1.9.8 Enhancement: Bump terraform 1.9 variants to 1.9.8
theohbrothers · Oct 17, 2024 · d9aa49e · d9aa49e
2 parents dfb3a58 + f8b89d0
commit d9aa49e
Show file tree

Hide file tree

Showing 6 changed files with 228 additions and 55 deletions.
diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
@@ -33,7 +33,7 @@ jobs:
  run: |
  git diff --exit-code
 
- build-1-9-7:
+ build-1-9-8:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
@@ -64,9 +64,9 @@ jobs:
  uses: actions/cache@v4
  with:
  path: /tmp/.buildx-cache
- key: ${{ runner.os }}-buildx-1.9.7-${{ github.sha }}
+ key: ${{ runner.os }}-buildx-1.9.8-${{ github.sha }}
  restore-keys: |
- ${{ runner.os }}-buildx-1.9.7-
+ ${{ runner.os }}-buildx-1.9.8-
  ${{ runner.os }}-buildx-
 
  - name: Login to Docker Hub registry
@@ -79,7 +79,7 @@ jobs:
 
  # This step generates the docker tags
  - name: Prepare
- id: prep-1-9-7
+ id: prep-1-9-8
  run: |
  set -e
 
@@ -92,7 +92,7 @@ jobs:
  # Generate docker image tags
  # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
  # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
- VARIANT="1.9.7"
+ VARIANT="1.9.8"
  REF_VARIANT="${REF}-${VARIANT}"
  REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -102,52 +102,52 @@ jobs:
  echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
  echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
- - name: 1.9.7 - Build (PRs)
+ - name: 1.9.8 - Build (PRs)
  # Run only on pull requests
  if: github.event_name == 'pull_request'
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7
+ context: variants/1.9.8
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: false
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8.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.9.7 - Build and push (master)
+ - name: 1.9.8 - Build and push (master)
  # Run only on master
  if: github.ref == 'refs/heads/master'
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7
+ context: variants/1.9.8
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: true
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8.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.9.7 - Build and push (release)
+ - name: 1.9.8 - Build and push (release)
  if: startsWith(github.ref, 'refs/tags/')
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7
+ context: variants/1.9.8
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: true
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7.outputs.VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8.outputs.VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8.outputs.REF_SHA_VARIANT }}
  ${{ github.repository }}:latest
  cache-from: type=local,src=/tmp/.buildx-cache
  cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
  # This step generates the docker tags
  - name: Prepare
- id: prep-1-9-7-jq-sops-ssh
+ id: prep-1-9-8-jq-sops-ssh
  run: |
  set -e
 
@@ -160,7 +160,7 @@ jobs:
  # Generate docker image tags
  # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
  # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
- VARIANT="1.9.7-jq-sops-ssh"
+ VARIANT="1.9.8-jq-sops-ssh"
  REF_VARIANT="${REF}-${VARIANT}"
  REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -170,51 +170,51 @@ jobs:
  echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
  echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
- - name: 1.9.7-jq-sops-ssh - Build (PRs)
+ - name: 1.9.8-jq-sops-ssh - Build (PRs)
  # Run only on pull requests
  if: github.event_name == 'pull_request'
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7-jq-sops-ssh
+ context: variants/1.9.8-jq-sops-ssh
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: false
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-sops-ssh.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-sops-ssh.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-sops-ssh.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-sops-ssh.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.9.7-jq-sops-ssh - Build and push (master)
+ - name: 1.9.8-jq-sops-ssh - Build and push (master)
  # Run only on master
  if: github.ref == 'refs/heads/master'
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7-jq-sops-ssh
+ context: variants/1.9.8-jq-sops-ssh
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: true
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-sops-ssh.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-sops-ssh.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-sops-ssh.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-sops-ssh.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.9.7-jq-sops-ssh - Build and push (release)
+ - name: 1.9.8-jq-sops-ssh - Build and push (release)
  if: startsWith(github.ref, 'refs/tags/')
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7-jq-sops-ssh
+ context: variants/1.9.8-jq-sops-ssh
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: true
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-sops-ssh.outputs.VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-sops-ssh.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-sops-ssh.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-sops-ssh.outputs.VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-sops-ssh.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-sops-ssh.outputs.REF_SHA_VARIANT }}
  cache-from: type=local,src=/tmp/.buildx-cache
  cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
  # This step generates the docker tags
  - name: Prepare
- id: prep-1-9-7-jq-libvirt-sops-ssh
+ id: prep-1-9-8-jq-libvirt-sops-ssh
  run: |
  set -e
 
@@ -227,7 +227,7 @@ jobs:
  # Generate docker image tags
  # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
  # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
- VARIANT="1.9.7-jq-libvirt-sops-ssh"
+ VARIANT="1.9.8-jq-libvirt-sops-ssh"
  REF_VARIANT="${REF}-${VARIANT}"
  REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -237,45 +237,45 @@ jobs:
  echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
  echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
- - name: 1.9.7-jq-libvirt-sops-ssh - Build (PRs)
+ - name: 1.9.8-jq-libvirt-sops-ssh - Build (PRs)
  # Run only on pull requests
  if: github.event_name == 'pull_request'
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7-jq-libvirt-sops-ssh
+ context: variants/1.9.8-jq-libvirt-sops-ssh
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: false
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-libvirt-sops-ssh.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-libvirt-sops-ssh.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-libvirt-sops-ssh.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-libvirt-sops-ssh.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.9.7-jq-libvirt-sops-ssh - Build and push (master)
+ - name: 1.9.8-jq-libvirt-sops-ssh - Build and push (master)
  # Run only on master
  if: github.ref == 'refs/heads/master'
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7-jq-libvirt-sops-ssh
+ context: variants/1.9.8-jq-libvirt-sops-ssh
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: true
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-libvirt-sops-ssh.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-libvirt-sops-ssh.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-libvirt-sops-ssh.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-libvirt-sops-ssh.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.9.7-jq-libvirt-sops-ssh - Build and push (release)
+ - name: 1.9.8-jq-libvirt-sops-ssh - Build and push (release)
  if: startsWith(github.ref, 'refs/tags/')
  uses: docker/build-push-action@v5
  with:
- context: variants/1.9.7-jq-libvirt-sops-ssh
+ context: variants/1.9.8-jq-libvirt-sops-ssh
  platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
  push: true
  tags: |
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-libvirt-sops-ssh.outputs.VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-libvirt-sops-ssh.outputs.REF_VARIANT }}
- ${{ github.repository }}:${{ steps.prep-1-9-7-jq-libvirt-sops-ssh.outputs.REF_SHA_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-libvirt-sops-ssh.outputs.VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-libvirt-sops-ssh.outputs.REF_VARIANT }}
+ ${{ github.repository }}:${{ steps.prep-1-9-8-jq-libvirt-sops-ssh.outputs.REF_SHA_VARIANT }}
  cache-from: type=local,src=/tmp/.buildx-cache
  cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -4590,7 +4590,7 @@ jobs:
 
  update-draft-release:
  needs:
- - build-1-9-7
+ - build-1-9-8
  - build-1-8-5
  - build-1-7-5
  - build-1-6-6
@@ -4621,7 +4621,7 @@ jobs:
 
  publish-draft-release:
  needs:
- - build-1-9-7
+ - build-1-9-8
  - build-1-8-5
  - build-1-7-5
  - build-1-6-6
@@ -4654,7 +4654,7 @@ jobs:
 
  update-dockerhub-description:
  needs:
- - build-1-9-7
+ - build-1-9-8
  - build-1-8-5
  - build-1-7-5
  - build-1-6-6

diff --git a/README.md b/README.md
@@ -12,9 +12,9 @@ The base image is `alpine`. The image is not the closed-source [`hashicorp/terra
 
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
-| `:1.9.7`, `:latest` | [View](variants/1.9.7) |
-| `:1.9.7-jq-sops-ssh` | [View](variants/1.9.7-jq-sops-ssh) |
-| `:1.9.7-jq-libvirt-sops-ssh` | [View](variants/1.9.7-jq-libvirt-sops-ssh) |
+| `:1.9.8`, `:latest` | [View](variants/1.9.8) |
+| `:1.9.8-jq-sops-ssh` | [View](variants/1.9.8-jq-sops-ssh) |
+| `:1.9.8-jq-libvirt-sops-ssh` | [View](variants/1.9.8-jq-libvirt-sops-ssh) |
 | `:1.8.5` | [View](variants/1.8.5) |
 | `:1.8.5-jq-sops-ssh` | [View](variants/1.8.5-jq-sops-ssh) |
 | `:1.8.5-jq-libvirt-sops-ssh` | [View](variants/1.8.5-jq-libvirt-sops-ssh) |

diff --git a/generate/definitions/versions.json b/generate/definitions/versions.json
@@ -1,7 +1,7 @@
 {
  "terraform": {
  "versions": [
- "1.9.7",
+ "1.9.8",
  "1.8.5",
  "1.7.5",
  "1.6.6",

diff --git a/variants/1.9.8-jq-libvirt-sops-ssh/Dockerfile b/variants/1.9.8-jq-libvirt-sops-ssh/Dockerfile
@@ -0,0 +1,63 @@
+FROM alpine:3.17
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+# Install terraform
+RUN set -eux; \
+ TERRAFORM_VERSION=1.9.8; \
+ case "$( uname -m )" in \
+ 'x86') \
+ URL="https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_386.zip"; \
+ SHA256=aa85bb2e0c68f2ee148d1ea854ee0aa78086017cbda9058371be8be2f4c18d10; \
+ ;; \
+ 'x86_64') \
+ URL="https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_amd64.zip"; \
+ SHA256=186e0145f5e5f2eb97cbd785bc78f21bae4ef15119349f6ad4fa535b83b10df8; \
+ ;; \
+ 'armhf') \
+ URL="https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_arm.zip"; \
+ SHA256=cb6db8471e361bb9ad6bbd43d9c780d37208e6dbe416900fdc8999af9e459b77; \
+ ;; \
+ 'armv7l') \
+ URL="https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_arm.zip"; \
+ SHA256=cb6db8471e361bb9ad6bbd43d9c780d37208e6dbe416900fdc8999af9e459b77; \
+ ;; \
+ 'aarch64') \
+ URL="https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_arm64.zip"; \
+ SHA256=f85868798834558239f6148834884008f2722548f84034c9b0f62934b2d73ebb; \
+ ;; \
+ *) \
+ echo "Architecture not supported"; \
+ exit 1; \
+ ;; \
+ esac; \
+ FILE=terraform.zip; \
+ wget -q "$URL" -O "$FILE"; \
+ echo "$SHA256 $FILE" | sha256sum -c -; \
+ unzip "$FILE" terraform; \
+ mkdir -pv /usr/local/bin; \
+ mv -v terraform /usr/local/bin/terraform; \
+ chmod +x /usr/local/bin/terraform; \
+ CHECKPOINT_DISABLE=1 terraform version; \
+ :
+
+RUN apk add --no-cache ca-certificates
+
+RUN apk add --no-cache jq
+
+RUN apk add --no-cache libvirt-client
+
+RUN set -eux; \
+ wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+ chmod +x /usr/local/bin/sops; \
+ sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+ sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client sshpass
+
+# Disable telemetry. See: https://developer.hashicorp.com/terraform/cli/commands#upgrade-and-security-bulletin-checks
+ENV CHECKPOINT_DISABLE=1
+
+CMD [ "terraform" ]