Updating CLI Server to have more architectures (#129)

* Updating CLI Server to have more architectures * Fixing cli donload for cosign
securesign · Dec 14, 2023 · a2d866d · a2d866d
1 parent 5ed1d4e
commit a2d866d
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 21 deletions.
diff --git a/charts/trusted-artifact-signer/templates/consoleclidownload-cosign.yaml b/charts/trusted-artifact-signer/templates/consoleclidownload-cosign.yaml
@@ -10,8 +10,16 @@ spec:
   links:
   - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/cosign.gz"
     text: Download cosign for Linux x86_64
-  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/windows/cosign.gz"
-    text: Download cosign for Windows x86_64
-  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/cosign.gz"
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/cosign-arm64.gz"
+    text: Download cosign for Linux arm64
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/cosign-ppc64le.gz"
+    text: Download cosign for Linux ppc64le
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/cosign-s390x.gz"
+    text: Download cosign for Linux s390x
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/cosign-amd64.gz"
     text: Download cosign for Mac x86_64
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/cosign-arm64.gz"
+    text: Download cosign for Mac arm64
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/windows/cosign-amd64.gz"
+    text: Download cosign for Windows x86_64
 {{- end }}
diff --git a/charts/trusted-artifact-signer/templates/consoleclidownload-gitsign.yaml b/charts/trusted-artifact-signer/templates/consoleclidownload-gitsign.yaml
@@ -8,10 +8,18 @@ spec:
     digitally sign and verify git commits.
   displayName: gitsign - Command Line Interface (CLI)
   links:
-  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/gitsign.gz"
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/gitsign-amd64.gz"
     text: Download gitsign for Linux x86_64
-  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/gitsign.gz"
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/gitsign-arm64.gz"
+    text: Download gitsign for Linux arm64
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/gitsign-ppc64le.gz"
+    text: Download gitsign for Linux ppc64le
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/gitsign-s390x.gz"
+    text: Download gitsign for Linux s390x
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/gitsign-amd64.gz"
     text: Download gitsign for Mac x86_64
-  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/windows/gitsign.gz"
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/gitsign-arm64.gz"
+    text: Download gitsign for Mac arm64
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/windows/gitsign-amd64.gz"
     text: Download gitsign for Windows x86_64
 {{- end }}
diff --git a/charts/trusted-artifact-signer/templates/consoleclidownload-rekor.yaml b/charts/trusted-artifact-signer/templates/consoleclidownload-rekor.yaml
@@ -8,10 +8,18 @@ spec:
     interact with rekor server.
   displayName: rekor - Command Line Interface (CLI)
   links:
-  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/rekor-cli.gz"
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/rekor-cli-amd64.gz"
     text: Download rekor-cli for Linux x86_64
-  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/rekor-cli.gz"
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/rekor-cli-arm64.gz"
+    text: Download rekor-cli for Linux arm64
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/rekor-cli-ppc64le.gz"
+    text: Download rekor-cli for Linux ppc64le
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/linux/rekor-cli-s390x.gz"
+    text: Download rekor-cli for Linux s390x
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/rekor-cli-amd64.gz"
     text: Download rekor-cli for Mac x86_64
-  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/windows/rekor-cli.gz"
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/darwin/rekor-cli-arm64.gz"
+    text: Download rekor-cli for Mac arm64
+  - href: "https://{{ $.Values.configs.clientserver.name }}-{{ $.Values.configs.clientserver.namespace }}.{{ $.Values.global.appsSubdomain }}/clients/windows/rekor-cli-amd64.gz"
     text: Download rekor-cli for Windows x86_64
 {{- end }}
diff --git a/images/Dockerfile-clientserver b/images/Dockerfile-clientserver
@@ -1,6 +1,6 @@
-FROM quay.io/redhat-user-workloads/rhtas-tenant/rhtas-cli-1-0-beta/cosign@sha256:48fe9148ff23eca281f2f22c25a8b7b1afd75673725a8a4ed5f14e297a308b41 AS cosign-image
-FROM quay.io/redhat-user-workloads/rhtas-tenant/rhtas-cli-1-0-beta/gitsign@sha256:62a3e34b0b918aaa60dc6a0647548ae89da3597121fcc4be8cb571fb89bbe278 AS gitsign-image
-FROM quay.io/redhat-user-workloads/rhtas-tenant/rhtas-cli-1-0-beta/rekor-cli@sha256:2e0287e5d37d32ef6751fc018573eb954456cd1c6227dfbc9ff5fcdcab59e07c AS rekor-image
+FROM quay.io/redhat-user-workloads/rhtas-tenant/cli-1-0-gamma/cosign-cli-2-2@sha256:34f0101f63303496c0f9b9e656510ed512bf7c6bf327c1e137f9a591fd221b5a AS cosign-image
+FROM quay.io/redhat-user-workloads/rhtas-tenant/cli-1-0-gamma/gitsign-cli-0-8@sha256:bd5a24c8ea3f0e1356ff36a93af775607b4d24446c85ef06d2d8c134f164d23b AS gitsign-image
+FROM quay.io/redhat-user-workloads/rhtas-tenant/cli-1-0-gamma/rekor-cli-1-3@sha256:120c08af4c57f5f24ba87f500a523759cdf7693bdd8d9652ae1c385258e181dc AS rekor-image
 
 FROM registry.access.redhat.com/ubi9/httpd-24@sha256:9aa4397b4bb4ceea9daa6eb24fe124bec0451a029bd571c06575906a1451e432
 
@@ -12,29 +12,52 @@ RUN mkdir -p /var/www/html/clients/windows
 
 COPY --from=cosign-image /usr/local/bin/cosign /var/www/html/clients/linux
 COPY --from=cosign-image /usr/local/bin/cosign-darwin-amd64.gz /var/www/html/clients/darwin
+COPY --from=cosign-image /usr/local/bin/cosign-darwin-arm64.gz /var/www/html/clients/darwin
+COPY --from=cosign-image /usr/local/bin/cosign-linux-arm64.gz /var/www/html/clients/linux
+COPY --from=cosign-image /usr/local/bin/cosign-linux-ppc64le.gz /var/www/html/clients/linux
+COPY --from=cosign-image /usr/local/bin/cosign-linux-s390x.gz /var/www/html/clients/linux
 COPY --from=cosign-image /usr/local/bin/cosign-windows-amd64.gz /var/www/html/clients/windows
 
 RUN gzip /var/www/html/clients/linux/cosign
 
 COPY --from=gitsign-image /usr/local/bin/gitsign_cli_darwin_amd64.gz /var/www/html/clients/darwin
+COPY --from=gitsign-image /usr/local/bin/gitsign_cli_darwin_arm64.gz /var/www/html/clients/darwin
 COPY --from=gitsign-image /usr/local/bin/gitsign_cli_linux_amd64.gz /var/www/html/clients/linux
+COPY --from=gitsign-image /usr/local/bin/gitsign_cli_linux_arm64.gz /var/www/html/clients/linux
+COPY --from=gitsign-image /usr/local/bin/gitsign_cli_linux_ppc64le.gz /var/www/html/clients/linux
+COPY --from=gitsign-image /usr/local/bin/gitsign_cli_linux_s390x.gz /var/www/html/clients/linux
 COPY --from=gitsign-image /usr/local/bin/gitsign_cli_windows_amd64.exe.gz /var/www/html/clients/windows
 
 COPY --from=rekor-image /usr/local/bin/rekor_cli_darwin_amd64.gz /var/www/html/clients/darwin
+COPY --from=rekor-image /usr/local/bin/rekor_cli_darwin_arm64.gz /var/www/html/clients/darwin
 COPY --from=rekor-image /usr/local/bin/rekor_cli_linux_amd64.gz /var/www/html/clients/linux
+COPY --from=rekor-image /usr/local/bin/rekor_cli_linux_arm64.gz /var/www/html/clients/linux
+COPY --from=rekor-image /usr/local/bin/rekor_cli_linux_ppc64le.gz /var/www/html/clients/linux
+COPY --from=rekor-image /usr/local/bin/rekor_cli_linux_s390x.gz /var/www/html/clients/linux
 COPY --from=rekor-image /usr/local/bin/rekor_cli_windows_amd64.exe.gz /var/www/html/clients/windows
 
-RUN mv /var/www/html/clients/darwin/gitsign_cli_darwin_amd64.gz /var/www/html/clients/darwin/gitsign.gz
-RUN mv /var/www/html/clients/linux/gitsign_cli_linux_amd64.gz /var/www/html/clients/linux/gitsign.gz
-RUN mv /var/www/html/clients/windows/gitsign_cli_windows_amd64.exe.gz /var/www/html/clients/windows/gitsign.gz
+RUN   mv /var/www/html/clients/darwin/gitsign_cli_darwin_amd64.gz /var/www/html/clients/darwin/gitsign-amd64.gz && \
+      mv /var/www/html/clients/darwin/gitsign_cli_darwin_arm64.gz /var/www/html/clients/darwin/gitsign-arm64.gz && \
+      mv /var/www/html/clients/linux/gitsign_cli_linux_amd64.gz /var/www/html/clients/linux/gitsign-amd64.gz && \
+      mv /var/www/html/clients/linux/gitsign_cli_linux_arm64.gz /var/www/html/clients/linux/gitsign-arm64.gz && \
+      mv /var/www/html/clients/linux/gitsign_cli_linux_ppc64le.gz /var/www/html/clients/linux/gitsign-ppc64le.gz && \
+      mv /var/www/html/clients/linux/gitsign_cli_linux_s390x.gz /var/www/html/clients/linux/gitsign-s390x.gz && \
+      mv /var/www/html/clients/windows/gitsign_cli_windows_amd64.exe.gz /var/www/html/clients/windows/gitsign-amd64.gz
 
-RUN mv /var/www/html/clients/darwin/rekor_cli_darwin_amd64.gz /var/www/html/clients/darwin/rekor-cli.gz
-RUN mv /var/www/html/clients/linux/rekor_cli_linux_amd64.gz /var/www/html/clients/linux/rekor-cli.gz
-RUN mv /var/www/html/clients/windows/rekor_cli_windows_amd64.exe.gz /var/www/html/clients/windows/rekor-cli.gz
-
-RUN mv /var/www/html/clients/darwin/cosign-darwin-amd64.gz /var/www/html/clients/darwin/cosign.gz
-RUN mv /var/www/html/clients/windows/cosign-windows-amd64.gz /var/www/html/clients/windows/cosign.gz
+RUN mv /var/www/html/clients/darwin/rekor_cli_darwin_amd64.gz /var/www/html/clients/darwin/rekor-cli-am64.gz && \
+      mv /var/www/html/clients/darwin/rekor_cli_darwin_arm64.gz /var/www/html/clients/darwin/rekor-cli-arm64.gz && \
+      mv /var/www/html/clients/linux/rekor_cli_linux_amd64.gz /var/www/html/clients/linux/rekor-cli-amd64.gz && \
+      mv /var/www/html/clients/linux/rekor_cli_linux_arm64.gz /var/www/html/clients/linux/rekor-cli-arm64.gz && \
+      mv /var/www/html/clients/linux/rekor_cli_linux_ppc64le.gz /var/www/html/clients/linux/rekor-cli-ppc64le.gz && \
+      mv /var/www/html/clients/linux/rekor_cli_linux_s390x.gz /var/www/html/clients/linux/rekor-cli-s390x.gz && \
+      mv /var/www/html/clients/windows/rekor_cli_windows_amd64.exe.gz /var/www/html/clients/windows/rekor-cli-amd64.gz
 
+RUN mv /var/www/html/clients/darwin/cosign-darwin-amd64.gz /var/www/html/clients/darwin/cosign-amd64.gz && \
+      mv /var/www/html/clients/windows/cosign-windows-amd64.gz /var/www/html/clients/windows/cosign-amd64.gz && \
+      mv /var/www/html/clients/darwin/cosign-darwin-arm64.gz /var/www/html/clients/darwin/cosign-arm64.gz && \
+      mv /var/www/html/clients/linux/cosign-linux-ppc64le.gz /var/www/html/clients/linux/cosign-ppc64le.gz && \
+      mv /var/www/html/clients/linux/cosign-linux-s390x.gz /var/www/html/clients/linux/cosign-s390x.gz && \
+      mv /var/www/html/clients/linux/cosign-linux-arm64.gz /var/www/html/clients/linux/cosign-arm64.gz
 
 CMD run-httpd