diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index c14160d..966b54d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Save supported versions as output id: set-matrix @@ -47,7 +47,7 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Save branch name as env var run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV @@ -56,13 +56,13 @@ jobs: run: echo "IMAGE_TAG=${BRANCH}_terraform-${{ matrix.tf_versions }}_awscli-${{ matrix.awscli_versions }}" >> $GITHUB_ENV - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and export container image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64 @@ -88,7 +88,7 @@ jobs: config: tests/container-structure-tests.yml - name: Build container image for all platforms - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386 diff --git a/.github/workflows/dockerhub-description-update.yml b/.github/workflows/dockerhub-description-update.yml index 6e3fc2c..f2f00ab 100644 --- a/.github/workflows/dockerhub-description-update.yml +++ b/.github/workflows/dockerhub-description-update.yml @@ -13,10 +13,10 @@ jobs: dockerHubDescription: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update Docker Hub Description - uses: peter-evans/dockerhub-description@v3 + uses: peter-evans/dockerhub-description@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PAT }} diff --git a/.github/workflows/lint-dockerfile.yml b/.github/workflows/lint-dockerfile.yml index 020a694..31e3e37 100644 --- a/.github/workflows/lint-dockerfile.yml +++ b/.github/workflows/lint-dockerfile.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Lint Dockerfile uses: hadolint/hadolint-action@v3.1.0 diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml index eda62d0..1582994 100644 --- a/.github/workflows/push-latest.yml +++ b/.github/workflows/push-latest.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Retrieve latest suported versions run: | @@ -33,14 +33,14 @@ jobs: run: echo '${{ secrets.DOCKERHUB_PAT }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and push container images - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 494c841..9828a7e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Save supported versions as output id: set-matrix @@ -35,7 +35,7 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get and save the release tag run: echo "RELEASE_TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV @@ -44,13 +44,13 @@ jobs: run: echo '${{ secrets.DOCKERHUB_PAT }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and push container images - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386 diff --git a/Dockerfile b/Dockerfile index 2af6f55..d64107c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Setup build arguments ARG AWS_CLI_VERSION ARG TERRAFORM_VERSION -ARG DEBIAN_VERSION=bookworm-20231120-slim +ARG DEBIAN_VERSION=bookworm-20260421-slim ARG DEBIAN_FRONTEND=noninteractive # Download Terraform binary @@ -10,10 +10,10 @@ ARG TARGETARCH ARG TERRAFORM_VERSION RUN apt-get update # RUN apt-get install --no-install-recommends -y libcurl4=7.74.0-1.3+deb11u7 -RUN apt-get install --no-install-recommends -y ca-certificates=20230311 -RUN apt-get install --no-install-recommends -y curl=7.88.1-10+deb12u4 -RUN apt-get install --no-install-recommends -y gnupg=2.2.40-1.1 -RUN apt-get install --no-install-recommends -y unzip=6.0-28 +RUN apt-get install --no-install-recommends -y ca-certificates # pinned by Renovate +RUN apt-get install --no-install-recommends -y curl # pinned by Renovate +RUN apt-get install --no-install-recommends -y gnupg # pinned by Renovate +RUN apt-get install --no-install-recommends -y unzip # pinned by Renovate WORKDIR /workspace RUN curl --silent --show-error --fail --remote-name https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_${TARGETARCH}.zip COPY security/hashicorp.asc ./ @@ -27,12 +27,12 @@ RUN unzip -j terraform_${TERRAFORM_VERSION}_linux_${TARGETARCH}.zip FROM debian:${DEBIAN_VERSION} as aws-cli ARG AWS_CLI_VERSION RUN apt-get update -RUN apt-get install -y --no-install-recommends ca-certificates=20230311 -RUN apt-get install -y --no-install-recommends curl=7.88.1-10+deb12u4 -RUN apt-get install -y --no-install-recommends gnupg=2.2.40-1.1 -RUN apt-get install -y --no-install-recommends unzip=6.0-28 -RUN apt-get install -y --no-install-recommends git=1:2.39.2-1.1 -RUN apt-get install -y --no-install-recommends jq=1.6-2.1 +RUN apt-get install -y --no-install-recommends ca-certificates # pinned by Renovate +RUN apt-get install -y --no-install-recommends curl # pinned by Renovate +RUN apt-get install -y --no-install-recommends gnupg # pinned by Renovate +RUN apt-get install -y --no-install-recommends unzip # pinned by Renovate +RUN apt-get install -y --no-install-recommends git # pinned by Renovate +RUN apt-get install -y --no-install-recommends jq # pinned by Renovate WORKDIR /workspace RUN curl --show-error --fail --output "awscliv2.zip" --remote-name "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI_VERSION}.zip" COPY security/awscliv2.asc ./ diff --git a/dev.sh b/dev.sh index c9f83f4..427e2ee 100755 --- a/dev.sh +++ b/dev.sh @@ -22,7 +22,7 @@ docker container run --rm --interactive \ --volume "${PWD}":/data \ --workdir /data \ --platform "${PLATEFORM}" \ - hadolint/hadolint:2.12.0-alpine /bin/hadolint \ + hadolint/hadolint:2.14.0-alpine /bin/hadolint \ --config hadolint.yaml Dockerfile echo "Lint Successful!" diff --git a/security/awscli-exe-linux-x86_64-2.22.35.zip.sig b/security/awscli-exe-linux-x86_64-2.22.35.zip.sig new file mode 100644 index 0000000..1525615 Binary files /dev/null and b/security/awscli-exe-linux-x86_64-2.22.35.zip.sig differ diff --git a/security/awscli-exe-linux-x86_64-2.27.50.zip.sig b/security/awscli-exe-linux-x86_64-2.27.50.zip.sig new file mode 100644 index 0000000..36fc1ca Binary files /dev/null and b/security/awscli-exe-linux-x86_64-2.27.50.zip.sig differ diff --git a/security/awscli-exe-linux-x86_64-2.34.34.zip.sig b/security/awscli-exe-linux-x86_64-2.34.34.zip.sig new file mode 100644 index 0000000..bc7c9d9 Binary files /dev/null and b/security/awscli-exe-linux-x86_64-2.34.34.zip.sig differ diff --git a/security/terraform_1.10.5_SHA256SUMS b/security/terraform_1.10.5_SHA256SUMS new file mode 100644 index 0000000..faf31f7 --- /dev/null +++ b/security/terraform_1.10.5_SHA256SUMS @@ -0,0 +1,14 @@ +4164db242076c7e99ac6aec67bc42b366925b97267e3883edaca4e4e408b082e terraform_1.10.5_darwin_amd64.zip +51910553dae21dab7f5f55912129602fd902e68a6b6d84b326a556a3e140b98b terraform_1.10.5_darwin_arm64.zip +6f26239a2c81d01f7b8a1fb800cfc7f87c0e3602cc4f0ab1a86b34fd19bd98d2 terraform_1.10.5_freebsd_386.zip +169cd9f061862b7c6c37235837c3ba8037db84e6e5fb6383761059b68456ebe1 terraform_1.10.5_freebsd_amd64.zip +2a49074caf5eb607a7ed6fdee10e0a54cf35223e5887809296f3c1671793553d terraform_1.10.5_freebsd_arm.zip +b88293a2ee2ee2aa805fb216229ab06ecd3485cf783dd525379af0faa3ab0789 terraform_1.10.5_linux_386.zip +0566a24f5332098b15716ebc394be503f4094acba5ba529bf5eb0698ed5e2a90 terraform_1.10.5_linux_amd64.zip +c446cbafed29342c9d7d71b8ce977cfc8be45352d9172dab50abac1da3cf0b89 terraform_1.10.5_linux_arm.zip +0ca5d6977c7c46bfa4bbe030030b911e897cf0cb72bff5525fb76c10f1c3409a terraform_1.10.5_linux_arm64.zip +0d2b4e80d5985696daa092150bba8ba147c0af34e5d2655ff766d74cd3aa3f4e terraform_1.10.5_openbsd_386.zip +cf4b25129a8489a483d3eda842c3c3123666ee5c46152f565a595ac95b6a3165 terraform_1.10.5_openbsd_amd64.zip +d07e4e3e3920d562a242f19705ee828bf37cbb336f195ca54dd4eb078875ce2e terraform_1.10.5_solaris_amd64.zip +e4bb69b7e9b4af2b5d2ad0a5a3943c7af2dfdf29c0982d86e12e086d6b730c66 terraform_1.10.5_windows_386.zip +4e2c6b7232aa30026baf9fe575f1bf4006c2a0cbbcdcbd244573dc188b439239 terraform_1.10.5_windows_amd64.zip diff --git a/security/terraform_1.10.5_SHA256SUMS.sig b/security/terraform_1.10.5_SHA256SUMS.sig new file mode 100644 index 0000000..f3a64aa Binary files /dev/null and b/security/terraform_1.10.5_SHA256SUMS.sig differ diff --git a/security/terraform_1.11.4_SHA256SUMS b/security/terraform_1.11.4_SHA256SUMS new file mode 100644 index 0000000..f9acd36 --- /dev/null +++ b/security/terraform_1.11.4_SHA256SUMS @@ -0,0 +1,14 @@ +a56d5002b9f7647291faccc3dd1a70350e60fb61e4c45037629508b8fdc2575b terraform_1.11.4_darwin_amd64.zip +867e0808fa971217043e25b7a792b10720c79b1546f8a68479b74f138be73e18 terraform_1.11.4_darwin_arm64.zip +eb3a9e0e2b5284a2775d4abe29400bac6414aaf37ef5f08550ba79215327b5ff terraform_1.11.4_freebsd_386.zip +79ac23f3620d1ca689480c915ec4fedc1bfad55293df97a040725f081079df33 terraform_1.11.4_freebsd_amd64.zip +148a21a7e1a875e22487ac17d838bb830b56a0e86b5a0249e5b58f0ecdf2750b terraform_1.11.4_freebsd_arm.zip +8e4bd232ce8b0cde2a90132a9c4d25665791c7a48bbb159f5cd4988265d10372 terraform_1.11.4_linux_386.zip +1ce994251c00281d6845f0f268637ba50c0005657eb3cf096b92f753b42ef4dc terraform_1.11.4_linux_amd64.zip +3cf072a049ab0178e9cbec47a14712ba7f38cc8ef061f3a7c0ff57b83d320edd terraform_1.11.4_linux_arm.zip +a43d1d0da9b9bab214a8305a39db0e40869572594ccf50c416a7756499143633 terraform_1.11.4_linux_arm64.zip +daa779fa52e964ca8cc4fdc5800aab73b51733a8717e7d6fc9365f38294b6a87 terraform_1.11.4_openbsd_386.zip +ae84a6ac484fdbb37fc4f2e19c310625c66d99a55b331d385ffd2ff956c1438c terraform_1.11.4_openbsd_amd64.zip +ed89570c92f6a308e4fa0269cc93edd4e5c8ab176193234b018fb293f504b139 terraform_1.11.4_solaris_amd64.zip +61da1ff3dc081fbaa9a032327dafebc311df55f04ad5f8749d92a9b6c1790f40 terraform_1.11.4_windows_386.zip +4e1dc85419dda723f2bb3afdf63a0d282a2de858588d56dd57d2e4e4c4c83f2b terraform_1.11.4_windows_amd64.zip diff --git a/security/terraform_1.11.4_SHA256SUMS.sig b/security/terraform_1.11.4_SHA256SUMS.sig new file mode 100644 index 0000000..d3bcfbb Binary files /dev/null and b/security/terraform_1.11.4_SHA256SUMS.sig differ diff --git a/security/terraform_1.7.5_SHA256SUMS b/security/terraform_1.7.5_SHA256SUMS new file mode 100644 index 0000000..d0e0d00 --- /dev/null +++ b/security/terraform_1.7.5_SHA256SUMS @@ -0,0 +1,14 @@ +0eaf64e28f82e2defd06f7a6f3187d8cea03d5d9fcd2af54f549a6c32d6833f7 terraform_1.7.5_darwin_amd64.zip +99c4d4feafb0183af2f7fbe07beeea6f83e5f5a29ae29fee3168b6810e37ff98 terraform_1.7.5_darwin_arm64.zip +3885fd4ce29788e040cfb350db88c6c1f3e34491c3f89f7a36ff8476f6c03959 terraform_1.7.5_freebsd_386.zip +3846d408255336460f40d7f5eeb7e987936f0359c9f45d1eb659a09f3d8893ab terraform_1.7.5_freebsd_amd64.zip +b02aa14ecb4052482bf4e64fca7de7a743fce691511f96b4cd58610350886c9e terraform_1.7.5_freebsd_arm.zip +e188ce5b45c9d10fa9a5a118438add2eab056d16587f774ecab93e3ca39e1bca terraform_1.7.5_linux_386.zip +3ff056b5e8259003f67fd0f0ed7229499cfb0b41f3ff55cc184088589994f7a5 terraform_1.7.5_linux_amd64.zip +4e74db9394d5cdf0f91cf8fecd290216edf6cf06273eb8f55e35f26eac4a936a terraform_1.7.5_linux_arm.zip +08631c385667dd28f03b3a3f77cb980393af4a2fcfc2236c148a678ad9150c8c terraform_1.7.5_linux_arm64.zip +c0416b6b9fe0155bb3377e39a3f584b9f7b9a11a1236b9ea8cf7c074a804a513 terraform_1.7.5_openbsd_386.zip +3bd02023764365b7ae7ee3e597a6258e896049e3fd115896bc01113384864cba terraform_1.7.5_openbsd_amd64.zip +385af229bd76a058c221b9c0be56f02a7d0fa2535620040c9c895df00e0f09ee terraform_1.7.5_solaris_amd64.zip +2639c9444c6091fd5ad76f112040d592e99931489582ada4d485c12a64a79052 terraform_1.7.5_windows_386.zip +9b7be6ae159191ec1f4b5b9d27529ae5243e41020fb545c0041235bec8d92269 terraform_1.7.5_windows_amd64.zip diff --git a/security/terraform_1.7.5_SHA256SUMS.sig b/security/terraform_1.7.5_SHA256SUMS.sig new file mode 100644 index 0000000..1b5ba45 Binary files /dev/null and b/security/terraform_1.7.5_SHA256SUMS.sig differ diff --git a/security/terraform_1.8.5_SHA256SUMS b/security/terraform_1.8.5_SHA256SUMS new file mode 100644 index 0000000..a4c096f --- /dev/null +++ b/security/terraform_1.8.5_SHA256SUMS @@ -0,0 +1,14 @@ +051c702e156a4d1a1c628783cf2ca0e1db8cca7b4c0f1686ea623558ed5560f9 terraform_1.8.5_darwin_amd64.zip +627c5005ab4a2bee36316f4967a41f16d55f79ea737f78b6bb34325c728c73e1 terraform_1.8.5_darwin_arm64.zip +4ad9453c00fadf63e525cf8548e710ca37d60b41c3b67f7cc03835c22cb91951 terraform_1.8.5_freebsd_386.zip +b0f6552a0286ebaba15ed3a7ecb10fde64fa554fa810819730bc25a2b9fdcddd terraform_1.8.5_freebsd_amd64.zip +15ab124fe4280137af7b819567e80507342ffbae35f12b306fc578cf187b5ca0 terraform_1.8.5_freebsd_arm.zip +3d3bda809de29295f7b208c12432eb147ea50186b0e1da9082c2db2a3708415b terraform_1.8.5_linux_386.zip +bb1ee3e8314da76658002e2e584f2d8854b6def50b7f124e27b957a42ddacfea terraform_1.8.5_linux_amd64.zip +2cd8cf46c46041c5f46766ec5e96728905df60ef92fd32d9889033ef8c305f46 terraform_1.8.5_linux_arm.zip +17b3a243ea24003a58ab324c197da8609fccae136bcb8a424bf61ec475b3a203 terraform_1.8.5_linux_arm64.zip +3fe034acf89a2b113fc37f46125bf805891e3f378bd8c14465515de2297423e8 terraform_1.8.5_openbsd_386.zip +5424a6435fd241774efdfc12f1e72eda0cdd276c6e3c9cf8f98fe094b4afb53f terraform_1.8.5_openbsd_amd64.zip +be5bd53fb7ea6dffd8febffdffd886cbd1af11114b90b519e569eda0419bc4a5 terraform_1.8.5_solaris_amd64.zip +6aae02b5d4386a6821f344c4aebb3902c032d1d4027e1b634533dc4151e80b78 terraform_1.8.5_windows_386.zip +17f93df5a4021a415f3fd50d2b55c0d093b42c64ea9957ceda55be3aaa91b0e5 terraform_1.8.5_windows_amd64.zip diff --git a/security/terraform_1.8.5_SHA256SUMS.sig b/security/terraform_1.8.5_SHA256SUMS.sig new file mode 100644 index 0000000..93d647e Binary files /dev/null and b/security/terraform_1.8.5_SHA256SUMS.sig differ diff --git a/security/terraform_1.9.8_SHA256SUMS b/security/terraform_1.9.8_SHA256SUMS new file mode 100644 index 0000000..c901f5d --- /dev/null +++ b/security/terraform_1.9.8_SHA256SUMS @@ -0,0 +1,14 @@ +be591e8c59c49d0cfbc7664d24910a4b43840b89d0a4bbca662149bbf0397e91 terraform_1.9.8_darwin_amd64.zip +873d7b925d08578fb6bb9c12c7cd92ae73e289e07c360f2fdd69f9036b7baaab terraform_1.9.8_darwin_arm64.zip +b1b56dbaa0ddda52a42b4398a1cebfd4ebc175391ef64b14747c65fa6debe072 terraform_1.9.8_freebsd_386.zip +aa7a936aeb5254abd1761282f4f0b2850b7507166f0344683f37a1e82da23f46 terraform_1.9.8_freebsd_amd64.zip +bdef3da36aa736bcc14767bd353667773d46aaf562b1d85dfa66e5266290247d terraform_1.9.8_freebsd_arm.zip +aa85bb2e0c68f2ee148d1ea854ee0aa78086017cbda9058371be8be2f4c18d10 terraform_1.9.8_linux_386.zip +186e0145f5e5f2eb97cbd785bc78f21bae4ef15119349f6ad4fa535b83b10df8 terraform_1.9.8_linux_amd64.zip +cb6db8471e361bb9ad6bbd43d9c780d37208e6dbe416900fdc8999af9e459b77 terraform_1.9.8_linux_arm.zip +f85868798834558239f6148834884008f2722548f84034c9b0f62934b2d73ebb terraform_1.9.8_linux_arm64.zip +851fa5b84efb78c31491f364ac1cdd6ea8e013ba04f9657acacc9401cfd479db terraform_1.9.8_openbsd_386.zip +e9311ffaa728c31a40493e6de35c13e1f7879468dd568d32ace2458725fb02d0 terraform_1.9.8_openbsd_amd64.zip +a8eaecd78c68e2b748fd5d6e2cf1a1e97ad891aa36d53509c7ad04bb86bd24cc terraform_1.9.8_solaris_amd64.zip +b9c5a8c3b4a91b89b67f8f58a84b27d0ad423f0286df959176691e077d9f6966 terraform_1.9.8_windows_386.zip +2667de56106bc6707968286357e29c20f8dbbb2f429ef57099b04994f82d9684 terraform_1.9.8_windows_amd64.zip diff --git a/security/terraform_1.9.8_SHA256SUMS.sig b/security/terraform_1.9.8_SHA256SUMS.sig new file mode 100644 index 0000000..e591a43 Binary files /dev/null and b/security/terraform_1.9.8_SHA256SUMS.sig differ diff --git a/supported_versions.json b/supported_versions.json index 0f73716..e0f230b 100644 --- a/supported_versions.json +++ b/supported_versions.json @@ -1,19 +1,4 @@ { - "tf_versions": [ - "0.11.15", - "0.12.31", - "0.13.7", - "0.14.11", - "0.15.5", - "1.0.11", - "1.1.9", - "1.2.9", - "1.3.9", - "1.4.6", - "1.5.7", - "1.6.5" - ], - "awscli_versions": [ - "2.14.5" - ] + "tf_versions": ["0.15.5","1.0.11","1.1.9","1.2.9","1.3.9","1.4.6","1.5.7","1.6.5","1.7.5","1.8.5","1.9.8","1.10.5","1.11.4"], + "awscli_versions": ["2.14.5","2.22.35","2.27.50","2.34.34"] }