diff --git a/.automation/build.py b/.automation/build.py index 3fb92259feb..ab81253b19e 100644 --- a/.automation/build.py +++ b/.automation/build.py @@ -306,15 +306,26 @@ def build_dockerfile( docker_copy += [dockerfile_item] docker_other += ["# Managed with " + dockerfile_item] # Already used item - elif dockerfile_item in all_dockerfile_items: + elif ( + dockerfile_item in all_dockerfile_items + or dockerfile_item.replace( + "RUN ", "RUN --mount=type=secret,id=GITHUB_TOKEN " + ) + in all_dockerfile_items + ): dockerfile_item = ( "# Next line commented because already managed by another linter\n" "# " + "\n# ".join(dockerfile_item.splitlines()) ) docker_other += [dockerfile_item] # RUN (standalone with GITHUB_TOKEN) - elif dockerfile_item.startswith("RUN") and "GITHUB_TOKEN" in dockerfile_item: - dockerfile_item_cmd = dockerfile_item.replace("RUN ", "RUN --mount=type=secret,id=GITHUB_TOKEN ") + elif ( + dockerfile_item.startswith("RUN") + and "GITHUB_TOKEN" in dockerfile_item + ): + dockerfile_item_cmd = dockerfile_item.replace( + "RUN ", "RUN --mount=type=secret,id=GITHUB_TOKEN " + ) docker_other += [dockerfile_item_cmd] is_docker_other_run = False # RUN (start) diff --git a/CHANGELOG.md b/CHANGELOG.md index c67008e10be..98c577d8ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,10 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l - Core - Upgrade base docker image from python:3.10.4-alpine3.16 to python:3.11.1-alpine3.17 + +- CI - Use docker/build-push-action to build docker images and akhilerm/tag-push-action to release by retagging and pushing beta images instead of rebuilding them + - Authenticate to GitHub API during docker build to avoid reaching limits - Linter versions upgrades - [golangci-lint](https://golangci-lint.run/) from 1.51.0 to **1.51.1** on 2023-02-06 diff --git a/Dockerfile b/Dockerfile index 741c1e5a6ac..4c4fe1d78b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -299,9 +299,9 @@ COPY --from=kics /app/bin/assets /opt/kics/assets/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START -RUN rc-update add docker boot && rc-service docker start || true \ +RUN rc-update add docker boot && rc-service docker start || true # ARM installation - && mkdir -p ${PWSH_DIRECTORY} \ +RUN --mount=type=secret,id=GITHUB_TOKEN mkdir -p ${PWSH_DIRECTORY} \ && curl --retry 5 --retry-delay 5 -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ @@ -311,10 +311,11 @@ RUN rc-update add docker boot && rc-service docker start || true \ | cut -d '"' -f 4 \ | xargs -n 1 wget -O - \ | tar -xzC ${PWSH_DIRECTORY} \ - && ln -sf ${PWSH_DIRECTORY}/pwsh /usr/bin/pwsh \ + && ln -sf ${PWSH_DIRECTORY}/pwsh /usr/bin/pwsh + # CSHARP installation - && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \ +RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \ && chmod +x dotnet-install.sh \ && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest @@ -341,7 +342,7 @@ RUN wget --tries=5 -q -O phive.phar https://phar.io/releases/phive.phar \ ENV PATH="/root/.composer/vendor/bin:$PATH" # POWERSHELL installation -RUN mkdir -p ${PWSH_DIRECTORY} \ +RUN --mount=type=secret,id=GITHUB_TOKEN mkdir -p ${PWSH_DIRECTORY} \ && curl --retry 5 --retry-delay 5 -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ @@ -352,14 +353,15 @@ RUN mkdir -p ${PWSH_DIRECTORY} \ | xargs -n 1 wget -O - \ | tar -xzC ${PWSH_DIRECTORY} \ && ln -sf ${PWSH_DIRECTORY}/pwsh /usr/bin/pwsh \ - && chmod +x /usr/bin/pwsh \ + && chmod +x /usr/bin/pwsh + # SALESFORCE installation # Next line commented because already managed by another linter # ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk # Next line commented because already managed by another linter # ENV PATH="$JAVA_HOME/bin:${PATH}" - && echo y|sfdx plugins:install sfdx-hardis \ +RUN echo y|sfdx plugins:install sfdx-hardis \ && npm cache clean --force || true \ && rm -rf /root/.npm/_cacache \ @@ -436,10 +438,10 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \ && golangci-lint --version \ # revive installation - && go install github.com/mgechev/revive@latest && go clean --cache \ + && go install github.com/mgechev/revive@latest && go clean --cache # checkstyle installation - && CHECKSTYLE_LATEST=$(curl -s \ +RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ https://api.github.com/repos/checkstyle/checkstyle/releases/latest \ @@ -447,10 +449,11 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \ | grep ".jar" \ | cut -d '"' -f 4) \ && curl --retry 5 --retry-delay 5 -sSL $CHECKSTYLE_LATEST \ - --output /usr/bin/checkstyle \ + --output /usr/bin/checkstyle + # pmd installation - && wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip && \ +RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip && \ unzip pmd-bin-${PMD_VERSION}.zip && \ rm pmd-bin-${PMD_VERSION}.zip && \ mv pmd-bin-${PMD_VERSION} /usr/bin/pmd && \ diff --git a/flavors/ci_light/Dockerfile b/flavors/ci_light/Dockerfile index f04faeee722..e62022d2b15 100644 --- a/flavors/ci_light/Dockerfile +++ b/flavors/ci_light/Dockerfile @@ -19,8 +19,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile index 2ebf4191378..a0bebc31535 100644 --- a/flavors/cupcake/Dockerfile +++ b/flavors/cupcake/Dockerfile @@ -25,8 +25,8 @@ FROM checkmarx/kics:alpine as kics ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## @@ -315,10 +315,10 @@ RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --c && golangci-lint --version \ # revive installation - && go install github.com/mgechev/revive@latest && go clean --cache \ + && go install github.com/mgechev/revive@latest && go clean --cache # checkstyle installation - && CHECKSTYLE_LATEST=$(curl -s \ +RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ https://api.github.com/repos/checkstyle/checkstyle/releases/latest \ @@ -326,10 +326,11 @@ RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --c | grep ".jar" \ | cut -d '"' -f 4) \ && curl --retry 5 --retry-delay 5 -sSL $CHECKSTYLE_LATEST \ - --output /usr/bin/checkstyle \ + --output /usr/bin/checkstyle + # pmd installation - && wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip && \ +RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip && \ unzip pmd-bin-${PMD_VERSION}.zip && \ rm pmd-bin-${PMD_VERSION}.zip && \ mv pmd-bin-${PMD_VERSION} /usr/bin/pmd && \ diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile index df18a20befa..2bcce0b87aa 100644 --- a/flavors/documentation/Dockerfile +++ b/flavors/documentation/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile index a942198216e..266e573322e 100644 --- a/flavors/dotnet/Dockerfile +++ b/flavors/dotnet/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## @@ -223,7 +223,7 @@ COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/ ############################################################################################# #OTHER__START # ARM installation -RUN mkdir -p ${PWSH_DIRECTORY} \ +RUN --mount=type=secret,id=GITHUB_TOKEN mkdir -p ${PWSH_DIRECTORY} \ && curl --retry 5 --retry-delay 5 -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ @@ -233,17 +233,18 @@ RUN mkdir -p ${PWSH_DIRECTORY} \ | cut -d '"' -f 4 \ | xargs -n 1 wget -O - \ | tar -xzC ${PWSH_DIRECTORY} \ - && ln -sf ${PWSH_DIRECTORY}/pwsh /usr/bin/pwsh \ + && ln -sf ${PWSH_DIRECTORY}/pwsh /usr/bin/pwsh + # CSHARP installation - && wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \ +RUN wget --tries=5 -q -O dotnet-install.sh https://dot.net/v1/dotnet-install.sh \ && chmod +x dotnet-install.sh \ && ./dotnet-install.sh --install-dir /usr/share/dotnet -channel 6.0 -version latest ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet" # POWERSHELL installation -RUN mkdir -p ${PWSH_DIRECTORY} \ +RUN --mount=type=secret,id=GITHUB_TOKEN mkdir -p ${PWSH_DIRECTORY} \ && curl --retry 5 --retry-delay 5 -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile index 2db231c9543..9b5b34f2678 100644 --- a/flavors/go/Dockerfile +++ b/flavors/go/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile index 046044d71f7..3bd10665f71 100644 --- a/flavors/java/Dockerfile +++ b/flavors/java/Dockerfile @@ -22,8 +22,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## @@ -236,10 +236,10 @@ RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --c # Managed with COPY --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker # dotenv-linter installation - && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ + && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s # checkstyle installation - && CHECKSTYLE_LATEST=$(curl -s \ +RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ https://api.github.com/repos/checkstyle/checkstyle/releases/latest \ @@ -247,10 +247,11 @@ RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --c | grep ".jar" \ | cut -d '"' -f 4) \ && curl --retry 5 --retry-delay 5 -sSL $CHECKSTYLE_LATEST \ - --output /usr/bin/checkstyle \ + --output /usr/bin/checkstyle + # pmd installation - && wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip && \ +RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${PMD_VERSION}/pmd-bin-${PMD_VERSION}.zip && \ unzip pmd-bin-${PMD_VERSION}.zip && \ rm pmd-bin-${PMD_VERSION}.zip && \ mv pmd-bin-${PMD_VERSION} /usr/bin/pmd && \ diff --git a/flavors/javascript/Dockerfile b/flavors/javascript/Dockerfile index 7d4a50fa126..38d55eb2188 100644 --- a/flavors/javascript/Dockerfile +++ b/flavors/javascript/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile index 33a7d995760..1555457ae3f 100644 --- a/flavors/php/Dockerfile +++ b/flavors/php/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile index a409bc572d1..dd25f32f16c 100644 --- a/flavors/python/Dockerfile +++ b/flavors/python/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/ruby/Dockerfile b/flavors/ruby/Dockerfile index c5a6b89859f..d153cda199b 100644 --- a/flavors/ruby/Dockerfile +++ b/flavors/ruby/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/rust/Dockerfile b/flavors/rust/Dockerfile index 9f37cbe1e5b..ce74810cfa5 100644 --- a/flavors/rust/Dockerfile +++ b/flavors/rust/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/salesforce/Dockerfile b/flavors/salesforce/Dockerfile index 214e492a8f3..9f072d2852a 100644 --- a/flavors/salesforce/Dockerfile +++ b/flavors/salesforce/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/security/Dockerfile b/flavors/security/Dockerfile index bf4f747ee10..f9b9ae3034e 100644 --- a/flavors/security/Dockerfile +++ b/flavors/security/Dockerfile @@ -22,8 +22,8 @@ FROM checkmarx/kics:alpine as kics ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/swift/Dockerfile b/flavors/swift/Dockerfile index 361cab63328..46a10fe8425 100644 --- a/flavors/swift/Dockerfile +++ b/flavors/swift/Dockerfile @@ -21,8 +21,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/flavors/terraform/Dockerfile b/flavors/terraform/Dockerfile index b0dd22bf581..39a73e9c96c 100644 --- a/flavors/terraform/Dockerfile +++ b/flavors/terraform/Dockerfile @@ -25,8 +25,8 @@ FROM checkmarx/kics:alpine as kics ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/ansible_ansible_lint/Dockerfile b/linters/ansible_ansible_lint/Dockerfile index 1f79866ebe2..b54d9fb8fa4 100644 --- a/linters/ansible_ansible_lint/Dockerfile +++ b/linters/ansible_ansible_lint/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/bash_shellcheck/Dockerfile b/linters/bash_shellcheck/Dockerfile index ee34a61d9c3..d15dd120d95 100644 --- a/linters/bash_shellcheck/Dockerfile +++ b/linters/bash_shellcheck/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/cloudformation_cfn_lint/Dockerfile b/linters/cloudformation_cfn_lint/Dockerfile index 49b07e40b0b..b2a0a703fe3 100644 --- a/linters/cloudformation_cfn_lint/Dockerfile +++ b/linters/cloudformation_cfn_lint/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/dockerfile_hadolint/Dockerfile b/linters/dockerfile_hadolint/Dockerfile index 65d3e118dbf..0ee598e8378 100644 --- a/linters/dockerfile_hadolint/Dockerfile +++ b/linters/dockerfile_hadolint/Dockerfile @@ -16,8 +16,8 @@ FROM hadolint/hadolint:v2.12.0-alpine as hadolint ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/go_revive/Dockerfile b/linters/go_revive/Dockerfile index 74d1f325f9b..032b8754eac 100644 --- a/linters/go_revive/Dockerfile +++ b/linters/go_revive/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/groovy_npm_groovy_lint/Dockerfile b/linters/groovy_npm_groovy_lint/Dockerfile index 07305379124..595650f7dc2 100644 --- a/linters/groovy_npm_groovy_lint/Dockerfile +++ b/linters/groovy_npm_groovy_lint/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/java_checkstyle/Dockerfile b/linters/java_checkstyle/Dockerfile index 9f21e7bd776..d81129da40e 100644 --- a/linters/java_checkstyle/Dockerfile +++ b/linters/java_checkstyle/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## @@ -127,7 +127,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" # checkstyle installation -RUN CHECKSTYLE_LATEST=$(curl -s \ +RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \ -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer $(cat /run/secrets/GITHUB_TOKEN)" \ https://api.github.com/repos/checkstyle/checkstyle/releases/latest \ diff --git a/linters/java_pmd/Dockerfile b/linters/java_pmd/Dockerfile index b3b7070a405..e7f660555ae 100644 --- a/linters/java_pmd/Dockerfile +++ b/linters/java_pmd/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/javascript_es/Dockerfile b/linters/javascript_es/Dockerfile index 4cb901fd6fc..ae276d591a9 100644 --- a/linters/javascript_es/Dockerfile +++ b/linters/javascript_es/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/json_eslint_plugin_jsonc/Dockerfile b/linters/json_eslint_plugin_jsonc/Dockerfile index fd7720fd436..770bfa11341 100644 --- a/linters/json_eslint_plugin_jsonc/Dockerfile +++ b/linters/json_eslint_plugin_jsonc/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/jsx_eslint/Dockerfile b/linters/jsx_eslint/Dockerfile index 8ad6d1b4d7a..ada8d341d28 100644 --- a/linters/jsx_eslint/Dockerfile +++ b/linters/jsx_eslint/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/kotlin_ktlint/Dockerfile b/linters/kotlin_ktlint/Dockerfile index 09dec1446bf..8ffd7ee2a55 100644 --- a/linters/kotlin_ktlint/Dockerfile +++ b/linters/kotlin_ktlint/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/php_psalm/Dockerfile b/linters/php_psalm/Dockerfile index 4158f93253c..f4256c45e14 100644 --- a/linters/php_psalm/Dockerfile +++ b/linters/php_psalm/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/python_bandit/Dockerfile b/linters/python_bandit/Dockerfile index 90452bc0b7a..fcedd0f5551 100644 --- a/linters/python_bandit/Dockerfile +++ b/linters/python_bandit/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/repository_checkov/Dockerfile b/linters/repository_checkov/Dockerfile index 6f4f767aa0b..0033c63d262 100644 --- a/linters/repository_checkov/Dockerfile +++ b/linters/repository_checkov/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/repository_devskim/Dockerfile b/linters/repository_devskim/Dockerfile index 9a86e1d1307..8f844dd9e95 100644 --- a/linters/repository_devskim/Dockerfile +++ b/linters/repository_devskim/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/repository_dustilock/Dockerfile b/linters/repository_dustilock/Dockerfile index d035ca3e25f..f97d77aa1e3 100644 --- a/linters/repository_dustilock/Dockerfile +++ b/linters/repository_dustilock/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/repository_gitleaks/Dockerfile b/linters/repository_gitleaks/Dockerfile index 5b1a2ccbdf7..7d7a643ebbd 100644 --- a/linters/repository_gitleaks/Dockerfile +++ b/linters/repository_gitleaks/Dockerfile @@ -16,8 +16,8 @@ FROM zricethezav/gitleaks:v8.15.3 as gitleaks ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/repository_secretlint/Dockerfile b/linters/repository_secretlint/Dockerfile index bd6ab5c9508..b11cd83726d 100644 --- a/linters/repository_secretlint/Dockerfile +++ b/linters/repository_secretlint/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/repository_semgrep/Dockerfile b/linters/repository_semgrep/Dockerfile index 78d5d59fd9e..f5a3985fcd2 100644 --- a/linters/repository_semgrep/Dockerfile +++ b/linters/repository_semgrep/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/repository_syft/Dockerfile b/linters/repository_syft/Dockerfile index ae77da2e700..ff2890c6342 100644 --- a/linters/repository_syft/Dockerfile +++ b/linters/repository_syft/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/repository_trivy/Dockerfile b/linters/repository_trivy/Dockerfile index b4b707bd52f..2077b460a4c 100644 --- a/linters/repository_trivy/Dockerfile +++ b/linters/repository_trivy/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/terraform_checkov/Dockerfile b/linters/terraform_checkov/Dockerfile index a2f0a0df6dd..ba2a3c1b236 100644 --- a/linters/terraform_checkov/Dockerfile +++ b/linters/terraform_checkov/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/terraform_terrascan/Dockerfile b/linters/terraform_terrascan/Dockerfile index 3fecfd98307..af8633c0557 100644 --- a/linters/terraform_terrascan/Dockerfile +++ b/linters/terraform_terrascan/Dockerfile @@ -16,8 +16,8 @@ FROM tenable/terrascan:1.16.0 as terrascan ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/terraform_tflint/Dockerfile b/linters/terraform_tflint/Dockerfile index 69251034c3d..04b165a034c 100644 --- a/linters/terraform_tflint/Dockerfile +++ b/linters/terraform_tflint/Dockerfile @@ -16,8 +16,8 @@ FROM ghcr.io/terraform-linters/tflint:v0.44.1 as tflint ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/tsx_eslint/Dockerfile b/linters/tsx_eslint/Dockerfile index c898b8ce83c..07f7f6533a9 100644 --- a/linters/tsx_eslint/Dockerfile +++ b/linters/tsx_eslint/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ## diff --git a/linters/typescript_es/Dockerfile b/linters/typescript_es/Dockerfile index 11e63b9f8cf..47cc799ee8d 100644 --- a/linters/typescript_es/Dockerfile +++ b/linters/typescript_es/Dockerfile @@ -16,8 +16,8 @@ ################## # Get base image # ################## -# 3.10.5 is not usable until https://github.com/jruere/multiprocessing-logging/issues/56 is fixed FROM python:3.11.1-alpine3.17 +ARG GITHUB_TOKEN ############################################################################################# ## @generated by .automation/build.py using descriptor files, please do not update manually ##