Merge pull request #20 from gdisdevops/feature/tt/official-cosign-build

use official cosign release again
gdisdevops · Aug 4, 2022 · 9c8862c · 9c8862c
2 parents cabf88c + fbf23e8
commit 9c8862c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git 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
diff --git a/blob/cosign_linux_arm64 b/blob/cosign_linux_arm64
diff --git 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
@@ -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