diff --git a/README.md b/README.md index 4450d5b..c08b955 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ TRIVY_VERSION=0.27.1 SONAR_SCANNER_VERSION=4.7.0.2747 INFRACOST_VERSION=v0.9.24 SONOBUOY_VERSION=0.56.6 -COSIGN_VERSION=1.10.0 +COSIGN_VERSION=1.10.1 SENTRY_CLI_VERSION=2.5.0 ## Jenkins JNLP Slave @@ -39,5 +39,5 @@ TRIVY_VERSION=0.27.1 SONAR_SCANNER_VERSION=4.7.0.2747 INFRACOST_VERSION=v0.9.24 SONOBUOY_VERSION=0.56.6 -COSIGN_VERSION=1.10.0 +COSIGN_VERSION=1.10.1 SENTRY_CLI_VERSION=2.5.0 diff --git a/blob/cosign_linux_amd64 b/blob/cosign_linux_amd64 deleted file mode 100755 index 20a5840..0000000 Binary files a/blob/cosign_linux_amd64 and /dev/null differ diff --git a/blob/cosign_linux_arm64 b/blob/cosign_linux_arm64 deleted file mode 100755 index 6d6dcc9..0000000 Binary files a/blob/cosign_linux_arm64 and /dev/null differ diff --git a/jenkins-inbound-agent/Dockerfile b/jenkins-inbound-agent/Dockerfile index 5008276..32e0a99 100644 --- a/jenkins-inbound-agent/Dockerfile +++ b/jenkins-inbound-agent/Dockerfile @@ -15,7 +15,7 @@ ARG TRIVY_VERSION=0.27.1 ARG SONAR_SCANNER_VERSION=4.7.0.2747 ARG INFRACOST_VERSION=v0.9.24 ARG SONOBUOY_VERSION=0.56.6 -ARG COSIGN_VERSION=1.9.0 +ARG COSIGN_VERSION=1.10.1 ARG SENTRY_CLI_VERSION=2.5.0 RUN set -eux; \ @@ -160,20 +160,16 @@ RUN set -eux; \ curl -L "${SENTRY_DOWNLOAD_URL}" -o sentry-cli; \ echo "${SENTRY_HASHSUM} sentry-cli" | sha256sum -c; \ mv sentry-cli /usr/local/bin/sentry-cli; \ - chmod +x /usr/local/bin/sentry-cli + chmod +x /usr/local/bin/sentry-cli; \ #### install cosign - #curl -L "${COSIGN_DOWNLOAD_URL}" -o cosign.deb; \ - # dpkg -i cosign.deb; \ - # rm cosign.deb; - - -COPY --chown=root:root ../blob/* /usr/local/bin/ + curl -L "${COSIGN_DOWNLOAD_URL}" -o cosign.deb; \ + dpkg -i cosign.deb; \ + rm cosign.deb; RUN mkdir -p /etc/tfenv \ && git clone --depth 1 https://github.com/tfutils/tfenv.git /etc/tfenv \ - && chown -R jenkins /etc/tfenv \ - && mv "/usr/local/bin/cosign_linux_$(dpkg --print-architecture)" /usr/local/bin/cosign + && chown -R jenkins /etc/tfenv USER jenkins #### install terraform with tfenv and helm diff diff --git a/jenkins-jnlp-slave/Dockerfile b/jenkins-jnlp-slave/Dockerfile index 496e28d..a963030 100644 --- a/jenkins-jnlp-slave/Dockerfile +++ b/jenkins-jnlp-slave/Dockerfile @@ -15,7 +15,7 @@ ARG TRIVY_VERSION=0.27.1 ARG SONAR_SCANNER_VERSION=4.7.0.2747 ARG INFRACOST_VERSION=v0.9.24 ARG SONOBUOY_VERSION=0.56.6 -ARG COSIGN_VERSION=1.9.0 +ARG COSIGN_VERSION=1.10.1 ARG SENTRY_CLI_VERSION=2.5.0 RUN set -eux; \ @@ -160,19 +160,16 @@ RUN set -eux; \ curl -L "${SENTRY_DOWNLOAD_URL}" -o sentry-cli; \ echo "${SENTRY_HASHSUM} sentry-cli" | sha256sum -c; \ mv sentry-cli /usr/local/bin/sentry-cli; \ - chmod +x /usr/local/bin/sentry-cli + chmod +x /usr/local/bin/sentry-cli; \ #### install cosign - #curl -L "${COSIGN_DOWNLOAD_URL}" -o cosign.deb; \ - # dpkg -i cosign.deb; \ - # rm cosign.deb; - -COPY --chown=root:root ../blob/* /usr/local/bin/ + curl -L "${COSIGN_DOWNLOAD_URL}" -o cosign.deb; \ + dpkg -i cosign.deb; \ + rm cosign.deb; RUN mkdir -p /etc/tfenv \ && git clone --depth 1 https://github.com/tfutils/tfenv.git /etc/tfenv \ - && chown -R jenkins /etc/tfenv \ - && mv "/usr/local/bin/cosign_linux_$(dpkg --print-architecture)" /usr/local/bin/cosign + && chown -R jenkins /etc/tfenv USER jenkins #### install terraform with tfenv and helm diff