diff --git a/.cicd-tools/containers/utilities/Dockerfile b/.cicd-tools/containers/utilities/Dockerfile index 062bcbd5..06d32f2e 100644 --- a/.cicd-tools/containers/utilities/Dockerfile +++ b/.cicd-tools/containers/utilities/Dockerfile @@ -14,15 +14,15 @@ RUN apt-get update \ xz-utils \ && rm -rf /var/lib/apt/lists/* -ENV ACTIONLINT_VERSION="https://github.com/rhysd/actionlint/releases/download/v1.6.26/actionlint_1.6.26_linux_${BUILD_ARG_ARCH_FORMAT_1}.tar.gz" +ENV ACTIONLINT_VERSION="https://github.com/rhysd/actionlint/releases/download/v1.7.4/actionlint_1.7.4_linux_${BUILD_ARG_ARCH_FORMAT_1}.tar.gz" ENV HADOLINT_VERSION="https://github.com/hadolint/hadolint/releases/download/v2.12.0/hadolint-Linux-${BUILD_ARG_ARCH_FORMAT_2}" ENV JQ_VERSION="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-${BUILD_ARG_ARCH_FORMAT_1}" -ENV SHFMT_VERSION="https://github.com/mvdan/sh/releases/download/v3.7.0/shfmt_v3.7.0_linux_${BUILD_ARG_ARCH_FORMAT_1}" -ENV SHELLCHECK_VERSION="https://github.com/koalaman/shellcheck/releases/download/v0.9.0/shellcheck-v0.9.0.linux.${BUILD_ARG_ARCH_FORMAT_3}.tar.xz" -ENV TOMLL_VERSION="https://github.com/pelletier/go-toml/releases/download/v2.1.1/tomll_2.1.1_linux_${BUILD_ARG_ARCH_FORMAT_1}.tar.xz" +ENV SHFMT_VERSION="https://github.com/mvdan/sh/releases/download/v3.10.0/shfmt_v3.10.0_linux_${BUILD_ARG_ARCH_FORMAT_1}" +ENV SHELLCHECK_VERSION="https://github.com/koalaman/shellcheck/releases/download/v0.10.0/shellcheck-v0.10.0.linux.${BUILD_ARG_ARCH_FORMAT_3}.tar.xz" +ENV TOMLL_VERSION="https://github.com/pelletier/go-toml/releases/download/v2.2.3/tomll_2.2.3_linux_${BUILD_ARG_ARCH_FORMAT_1}.tar.xz" ENV VALE_VERSION="https://github.com/errata-ai/vale/releases/download/v2.30.0/vale_2.30.0_Linux_${BUILD_ARG_ARCH_FORMAT_4}.tar.gz" -ENV VALE3_VERSION="https://github.com/errata-ai/vale/releases/download/v3.6.0/vale_3.6.0_Linux_${BUILD_ARG_ARCH_FORMAT_4}.tar.gz" -ENV YQ_VERSION="https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_${BUILD_ARG_ARCH_FORMAT_1}" +ENV VALE3_VERSION="https://github.com/errata-ai/vale/releases/download/v3.9.1/vale_3.9.1_Linux_${BUILD_ARG_ARCH_FORMAT_4}.tar.gz" +ENV YQ_VERSION="https://github.com/mikefarah/yq/releases/download/v4.44.5/yq_linux_${BUILD_ARG_ARCH_FORMAT_1}" RUN mkdir -p /dist diff --git a/.cicd-tools/containers/utilities/amd64/Dockerfile.sha256 b/.cicd-tools/containers/utilities/amd64/Dockerfile.sha256 index fbfbcad7..82d91abf 100644 --- a/.cicd-tools/containers/utilities/amd64/Dockerfile.sha256 +++ b/.cicd-tools/containers/utilities/amd64/Dockerfile.sha256 @@ -1,9 +1,9 @@ -2682275749f9f86b958b35d8a48376466a30b2326a9d6b8f4ba3fe3adfe284cb actionlint +39cae525cdb54af5d91dcf27f55e040d37ecea01dd4153490c4dc84f5d251d46 actionlint 56de6d5e5ec427e17b74fa48d51271c7fc0d61244bf5c90e828aab8362d55010 hadolint 5942c9b0934e510ee61eb3e30273f1b3fe2590df93933a93d7c58b81d19c8ff5 jq -7087178d54de6652b404c306233264463cb9e7a9afeb259bb663cc4dbfd64149 shellcheck -0264c424278b18e22453fe523ec01a19805ce3b8ebf18eaf3aadc1edc23f42e3 shfmt -f57a40a14636198a8bfa5ad0d27c0f5e62b4ecea069d447a0ddccee781c6a75a tomll +f35ae15a4677945428bdfe61ccc297490d89dd1e544cc06317102637638c6deb shellcheck +1f57a384d59542f8fac5f503da1f3ea44242f46dff969569e80b524d64b71dbc shfmt +1f4dad94c8be433b365d3cdf305e88b0af14d2021e677a7725919739c2372735 tomll 8d81028547b8724d25d85a686d9a6d189b9f02aca3ce9646737709c8e3898e57 vale -2150050dafb316d5d59fcd4abed8c0edfb85c1d74eed9a8acdbbf0d047f63c9d vale3 -a2c097180dd884a8d50c956ee16a9cec070f30a7947cf4ebf87d5f36213e9ed7 yq +efeb3a025c7364db8a3d3651be9689e8e54fd2fba4481a9b8870ce64b0def4a8 vale3 +638c4b251c49201fc94b598834b715f8f1c6e9b1854d2820772d2c79f0289002 yq diff --git a/.cicd-tools/containers/utilities/arm64/Dockerfile.sha256 b/.cicd-tools/containers/utilities/arm64/Dockerfile.sha256 index d895c9e8..960a4f0a 100644 --- a/.cicd-tools/containers/utilities/arm64/Dockerfile.sha256 +++ b/.cicd-tools/containers/utilities/arm64/Dockerfile.sha256 @@ -1,9 +1,9 @@ -99c8f183eb4c492d7e859257790284ad7e0a375395ae4bc9a0c783f4b96df868 actionlint +22d1e9aa8c3d0571b4edc507006418b541e99c57b83e573bea2512977718b615 actionlint 5798551bf19f33951881f15eb238f90aef023f11e7ec7e9f4c37961cb87c5df6 hadolint 4dd2d8a0661df0b22f1bb9a1f9830f06b6f3b8f7d91211a1ef5d7c4f06a8b4a5 jq -ef4c0f06039f2034dfba012251ddfeb1edba88e049fc5edfbc289fef179daaa0 shellcheck -111612560d15bd53d8e8f8f85731176ce12f3b418ec473d39a40ed6bbec772de shfmt -4e3fb088a2dbb6a2001223e77bbe87dc7f85ad06c06f9c00d402d08e0e1436c2 tomll +4111c09318d10b93653a42179381273f31061b34987978346fbd19a6e81a74c3 shellcheck +9d23013d56640e228732fd2a04a9ede0ab46bc2d764bf22a4a35fb1b14d707a8 shfmt +96fce91d5e1dd4e6fbdcf74325f6a0396ef8906727183183f3f7185269215da9 tomll 8a7a289c79ae0c19a9cc642bf98e8aee135981731c375bfd5cd6504f1a90bf1c vale -2807924d7edd1e649fa34e87ef19195340347fccf0ef34c2a9096ae11fd9571b vale3 -0e7e1524f68d91b3ff9b089872d185940ab0fa020a5a9052046ef10547023156 yq +0c53b79c413df49b5c25610510e2fbb8e387ab041ce96c17a46e25b59e4b1415 vale3 +8205dd975725cd13bf8ecb03a9ef48ef64fdffdbf2e23cbdd7a4462c5e386211 yq diff --git a/.github/workflows/workflow-container-gettext-multiarch.yml b/.github/workflows/workflow-container-gettext-multiarch.yml index 1dbb0505..b5e800f9 100644 --- a/.github/workflows/workflow-container-gettext-multiarch.yml +++ b/.github/workflows/workflow-container-gettext-multiarch.yml @@ -7,6 +7,7 @@ on: - ".cicd-tools/containers/gettext" - ".github/workflows/workflow-container-gettext-multiarch.yml" - ".github/workflows/job-*-container-*.yml" + - ".grype.yaml" - "scripts/containers.sh" schedule: - cron: "0 6 * * 1" diff --git a/.github/workflows/workflow-container-gpg-multiarch.yml b/.github/workflows/workflow-container-gpg-multiarch.yml index 0993f137..53a0ce5e 100644 --- a/.github/workflows/workflow-container-gpg-multiarch.yml +++ b/.github/workflows/workflow-container-gpg-multiarch.yml @@ -7,6 +7,7 @@ on: - ".cicd-tools/containers/gpg" - ".github/workflows/workflow-container-gpg-multiarch.yml" - ".github/workflows/job-*-container-*.yml" + - ".grype.yaml" - "scripts/containers.sh" schedule: - cron: "0 6 * * 1" diff --git a/.github/workflows/workflow-container-utilities-multiarch.yml b/.github/workflows/workflow-container-utilities-multiarch.yml index 6a6102fa..a1b009e1 100644 --- a/.github/workflows/workflow-container-utilities-multiarch.yml +++ b/.github/workflows/workflow-container-utilities-multiarch.yml @@ -7,6 +7,7 @@ on: - ".cicd-tools/containers/utilities" - ".github/workflows/workflow-container-utilities-multiarch.yml" - ".github/workflows/job-*-container-*.yml" + - ".grype.yaml" - "scripts/containers.sh" schedule: - cron: "0 6 * * 1" diff --git a/.grype.yaml b/.grype.yaml new file mode 100644 index 00000000..7165d6ab --- /dev/null +++ b/.grype.yaml @@ -0,0 +1,4 @@ +--- +ignore: + - vulnerability: CVE-2023-24531 # vale2 was built with an older version of golang + - vulnerability: CVE-2024-24790 # vale2 was built with an older version of golang