Merge pull request #19 from gdisdevops/feature/tt/add-sentry-cli

add sentry cli
gdisdevops · Jul 29, 2022 · cabf88c · cabf88c
2 parents 9697232 + 18e36dd
commit cabf88c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 13 deletions.
diff --git a/.github/workflows/jenkins-jnlp-slave-docker-publish.yml b/.github/workflows/jenkins-jnlp-slave-docker-publish.yml
@@ -64,7 +64,7 @@ jobs:
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        uses: docker/login-action@v2.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -74,7 +74,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@v4.0.1
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.image }}
           tags: |
@@ -86,7 +86,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        uses: docker/build-push-action@v3.1.0
         with:
           file: ${{ matrix.image }}/Dockerfile
           platforms: linux/amd64,linux/arm64

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Jenkins JNLP images with additional tooling.
 
 ## Jenkins Inbound Agent
 
-INBOUND_AGENT_VERSION=4.10-3  
+INBOUND_AGENT_VERSION=4.13.2-1  
 VAULT_VERSION=1.5.3  
 PACKER_VERSION=1.8.1  
 TERRAFORM_1_VERSION=1.0.5  
@@ -18,13 +18,14 @@ 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.9.0  
+COSIGN_VERSION=1.10.0  
+SENTRY_CLI_VERSION=2.5.0  
 
 ## Jenkins JNLP Slave
 
 :warning: DEPRECATED :warning:
 
-INBOUND_AGENT_VERSION=4.3-9  
+INBOUND_AGENT_VERSION=4.13.2-1  
 VAULT_VERSION=1.5.3  
 PACKER_VERSION=1.8.1  
 TERRAFORM_1_VERSION=1.0.5  
@@ -38,4 +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.9.0  
+COSIGN_VERSION=1.10.0  
+SENTRY_CLI_VERSION=2.5.0  
diff --git a/jenkins-inbound-agent/Dockerfile b/jenkins-inbound-agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/inbound-agent:4.10-3
+FROM jenkins/inbound-agent:4.13.2-1
 
 USER root
 
@@ -16,6 +16,7 @@ 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 SENTRY_CLI_VERSION=2.5.0
 
 RUN set -eux; \
     apt-get update; \
@@ -51,7 +52,9 @@ RUN set -eux; \
           INFRACOST_DOWNLOAD_URL="https://github.com/infracost/infracost/releases/download/${INFRACOST_VERSION}"; \
           SONOBUOY_DOWNLOAD_FILE="sonobuoy_${SONOBUOY_VERSION}_linux_arm64"; \
           SONOBUOY_DOWNLOAD_URL="https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}"; \
-          COSIGN_DOWNLOAD_URL="https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign_${COSIGN_VERSION}_arm64.deb" \
+          COSIGN_DOWNLOAD_URL="https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign_${COSIGN_VERSION}_arm64.deb"; \
+          SENTRY_DOWNLOAD_URL="https://release-registry.services.sentry.io/apps/sentry-cli/${SENTRY_CLI_VERSION}?response=download&arch=aarch64&platform=Linux&package=sentry-cli"; \
+          SENTRY_HASHSUM="4d4bfdefc86738feec7e59ff5b0e7c824c37fa8c150e8926a020b0a1e4f84120"; \
          ;; \
        amd64|x86_64) \
           AWS_CLI_DOWNLOAD_URL="https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip"; \
@@ -69,6 +72,8 @@ RUN set -eux; \
           SONOBUOY_DOWNLOAD_FILE="sonobuoy_${SONOBUOY_VERSION}_linux_amd64"; \
           SONOBUOY_DOWNLOAD_URL="https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}"; \
           COSIGN_DOWNLOAD_URL="https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign_${COSIGN_VERSION}_amd64.deb"; \
+          SENTRY_DOWNLOAD_URL="https://release-registry.services.sentry.io/apps/sentry-cli/${SENTRY_CLI_VERSION}?response=download&arch=x86_64&platform=Linux&package=sentry-cli"; \
+          SENTRY_HASHSUM="f35d3cee001eb20b0706da9ddd939890371b0fd7b430a7ef3d3dfae8718b75a3"; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -149,7 +154,13 @@ RUN set -eux; \
       tar -xvzf "${SONOBUOY_DOWNLOAD_FILE}.tar.gz"; \
       mv ./sonobuoy /usr/local/bin/sonobuoy; \
       chmod +x /usr/local/bin/sonobuoy; \
-      rm "${SONOBUOY_DOWNLOAD_FILE}.tar.gz" "sonobuoy_${SONOBUOY_VERSION}_checksums.txt" LICENSE;
+      rm "${SONOBUOY_DOWNLOAD_FILE}.tar.gz" "sonobuoy_${SONOBUOY_VERSION}_checksums.txt" LICENSE; \
+
+    #### install sentry-cli
+    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
 
     #### install cosign
     #curl -L "${COSIGN_DOWNLOAD_URL}" -o cosign.deb; \

diff --git a/jenkins-jnlp-slave/Dockerfile b/jenkins-jnlp-slave/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jnlp-slave:4.3-9
+FROM jenkins/jnlp-slave:4.13.2-1
 
 USER root
 
@@ -16,6 +16,7 @@ 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 SENTRY_CLI_VERSION=2.5.0
 
 RUN set -eux; \
     apt-get update; \
@@ -51,7 +52,9 @@ RUN set -eux; \
           INFRACOST_DOWNLOAD_URL="https://github.com/infracost/infracost/releases/download/${INFRACOST_VERSION}"; \
           SONOBUOY_DOWNLOAD_FILE="sonobuoy_${SONOBUOY_VERSION}_linux_arm64"; \
           SONOBUOY_DOWNLOAD_URL="https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}"; \
-          COSIGN_DOWNLOAD_URL="https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign_${COSIGN_VERSION}_arm64.deb" \
+          COSIGN_DOWNLOAD_URL="https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign_${COSIGN_VERSION}_arm64.deb"; \
+          SENTRY_DOWNLOAD_URL="https://release-registry.services.sentry.io/apps/sentry-cli/${SENTRY_CLI_VERSION}?response=download&arch=aarch64&platform=Linux&package=sentry-cli"; \
+          SENTRY_HASHSUM="4d4bfdefc86738feec7e59ff5b0e7c824c37fa8c150e8926a020b0a1e4f84120"; \
          ;; \
        amd64|x86_64) \
           AWS_CLI_DOWNLOAD_URL="https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip"; \
@@ -69,6 +72,8 @@ RUN set -eux; \
           SONOBUOY_DOWNLOAD_FILE="sonobuoy_${SONOBUOY_VERSION}_linux_amd64"; \
           SONOBUOY_DOWNLOAD_URL="https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}"; \
           COSIGN_DOWNLOAD_URL="https://github.com/sigstore/cosign/releases/download/v${COSIGN_VERSION}/cosign_${COSIGN_VERSION}_amd64.deb"; \
+          SENTRY_DOWNLOAD_URL="https://release-registry.services.sentry.io/apps/sentry-cli/${SENTRY_CLI_VERSION}?response=download&arch=x86_64&platform=Linux&package=sentry-cli"; \
+          SENTRY_HASHSUM="f35d3cee001eb20b0706da9ddd939890371b0fd7b430a7ef3d3dfae8718b75a3"; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -149,7 +154,13 @@ RUN set -eux; \
       tar -xvzf "${SONOBUOY_DOWNLOAD_FILE}.tar.gz"; \
       mv ./sonobuoy /usr/local/bin/sonobuoy; \
       chmod +x /usr/local/bin/sonobuoy; \
-      rm "${SONOBUOY_DOWNLOAD_FILE}.tar.gz" "sonobuoy_${SONOBUOY_VERSION}_checksums.txt" LICENSE;
+      rm "${SONOBUOY_DOWNLOAD_FILE}.tar.gz" "sonobuoy_${SONOBUOY_VERSION}_checksums.txt" LICENSE; \
+
+    #### install sentry-cli
+    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
 
     #### install cosign
     #curl -L "${COSIGN_DOWNLOAD_URL}" -o cosign.deb; \