From 2f568343d36bf80969122b9f863d7a742dfb0b0e Mon Sep 17 00:00:00 2001 From: JasonPowr <20076537@mail.wit.ie> Date: Fri, 1 Mar 2024 15:05:17 +0000 Subject: [PATCH] client-server-changes --- Dockerfile.client-server-cg.rh | 40 +++++++++++++++++----------------- Dockerfile.client-server-re.rh | 40 +++++++++++++++++----------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Dockerfile.client-server-cg.rh b/Dockerfile.client-server-cg.rh index 42a6257be1f..8d16f423f39 100644 --- a/Dockerfile.client-server-cg.rh +++ b/Dockerfile.client-server-cg.rh @@ -33,29 +33,29 @@ RUN oc image extract ${COSIGN_IMAGE} --path /usr/local/bin/cosign*:/downloads/c RUN gzip /downloads/cosign/cosign && \ mv /downloads/cosign/cosign.gz /downloads/cosign/cosign-linux-amd64.gz -FROM registry.access.redhat.com/ubi9/httpd-24@sha256:965f7b03ae8f45228bad765ce47bc8956711e854213df0e4cee8623d51317b0a +FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:06d06f15f7b641a78f2512c8817cbecaa1bf549488e273f5ac27ff1654ed33f0 +ENV APP_ROOT=/opt/app-root +WORKDIR $APP_ROOT/src/ -RUN mkdir -p /var/www/html/clients/darwin && \ - mkdir -p /var/www/html/clients/linux && \ - mkdir -p /var/www/html/clients/windows +RUN mkdir -p $APP_ROOT/src/clients/darwin && \ + mkdir -p $APP_ROOT/src/clients/linux && \ + mkdir -p $APP_ROOT/src/clients/windows -COPY --from=downloads /downloads/cosign/cosign-darwin-amd64.gz /var/www/html/clients/darwin/cosign-amd64.gz -COPY --from=downloads /downloads/cosign/cosign-darwin-arm64.gz /var/www/html/clients/darwin/cosign-arm64.gz -COPY --from=downloads /downloads/cosign/cosign-linux-amd64.gz /var/www/html/clients/linux/cosign-amd64.gz -COPY --from=downloads /downloads/cosign/cosign-linux-arm64.gz /var/www/html/clients/linux/cosign-arm64.gz -COPY --from=downloads /downloads/cosign/cosign-linux-ppc64le.gz /var/www/html/clients/linux/cosign-ppc64le.gz -COPY --from=downloads /downloads/cosign/cosign-linux-s390x.gz /var/www/html/clients/linux/cosign-s390x.gz -COPY --from=downloads /downloads/cosign/cosign-windows-amd64.gz /var/www/html/clients/windows/cosign-amd64.gz +COPY --from=downloads /downloads/cosign/cosign-darwin-amd64.gz $APP_ROOT/src/clients/darwin/cosign-amd64.gz +COPY --from=downloads /downloads/cosign/cosign-darwin-arm64.gz $APP_ROOT/src/clients/darwin/cosign-arm64.gz +COPY --from=downloads /downloads/cosign/cosign-linux-amd64.gz $APP_ROOT/src/clients/linux/cosign-amd64.gz +COPY --from=downloads /downloads/cosign/cosign-linux-arm64.gz $APP_ROOT/src/clients/linux/cosign-arm64.gz +COPY --from=downloads /downloads/cosign/cosign-linux-ppc64le.gz $APP_ROOT/src/clients/linux/cosign-ppc64le.gz +COPY --from=downloads /downloads/cosign/cosign-linux-s390x.gz $APP_ROOT/src/clients/linux/cosign-s390x.gz +COPY --from=downloads /downloads/cosign/cosign-windows-amd64.gz $APP_ROOT/src/clients/windows/cosign-amd64.gz -COPY --from=downloads /downloads/gitsign/gitsign_cli_darwin_amd64.gz /var/www/html/clients/darwin/gitsign-amd64.gz -COPY --from=downloads /downloads/gitsign/gitsign_cli_darwin_arm64.gz /var/www/html/clients/darwin/gitsign-arm64.gz -COPY --from=downloads /downloads/gitsign/gitsign_cli_linux_amd64.gz /var/www/html/clients/linux/gitsign-amd64.gz -COPY --from=downloads /downloads/gitsign/gitsign_cli_linux_arm64.gz /var/www/html/clients/linux/gitsign-arm64.gz -COPY --from=downloads /downloads/gitsign/gitsign_cli_linux_ppc64le.gz /var/www/html/clients/linux/gitsign-ppc64le.gz -COPY --from=downloads /downloads/gitsign/gitsign_cli_linux_s390x.gz /var/www/html/clients/linux/gitsign-s390x.gz -COPY --from=downloads /downloads/gitsign/gitsign_cli_windows_amd64.exe.gz /var/www/html/clients/windows/gitsign-amd64.gz - -CMD run-httpd +COPY --from=downloads /downloads/gitsign/gitsign_cli_darwin_amd64.gz $APP_ROOT/src/clients/darwin/gitsign-amd64.gz +COPY --from=downloads /downloads/gitsign/gitsign_cli_darwin_arm64.gz $APP_ROOT/src/clients/darwin/gitsign-arm64.gz +COPY --from=downloads /downloads/gitsign/gitsign_cli_linux_amd64.gz $APP_ROOT/src/clients/linux/gitsign-amd64.gz +COPY --from=downloads /downloads/gitsign/gitsign_cli_linux_arm64.gz $APP_ROOT/src/clients/linux/gitsign-arm64.gz +COPY --from=downloads /downloads/gitsign/gitsign_cli_linux_ppc64le.gz $APP_ROOT/src/clients/linux/gitsign-ppc64le.gz +COPY --from=downloads /downloads/gitsign/gitsign_cli_linux_s390x.gz $APP_ROOT/src/clients/linux/gitsign-s390x.gz +COPY --from=downloads /downloads/gitsign/gitsign_cli_windows_amd64.exe.gz $APP_ROOT/src/clients/windows/gitsign-amd64.gz LABEL \ com.redhat.component="trusted-artifact-signer-serve-cli-container-cg" \ diff --git a/Dockerfile.client-server-re.rh b/Dockerfile.client-server-re.rh index 5b43f1cc9ce..1afa77e3cbd 100644 --- a/Dockerfile.client-server-re.rh +++ b/Dockerfile.client-server-re.rh @@ -29,29 +29,29 @@ RUN mkdir -p /downloads/rekor && \ RUN oc image extract ${REKOR_IMAGE} --path /usr/local/bin/rekor_cli_*:/downloads/rekor && \ oc image extract ${EC_IMAGE} --path /usr/local/bin/ec_*:/downloads/ec -FROM registry.access.redhat.com/ubi9/httpd-24@sha256:965f7b03ae8f45228bad765ce47bc8956711e854213df0e4cee8623d51317b0a +FROM registry.access.redhat.com/ubi9/ubi-minimal@sha256:06d06f15f7b641a78f2512c8817cbecaa1bf549488e273f5ac27ff1654ed33f0 +ENV APP_ROOT=/opt/app-root +WORKDIR $APP_ROOT/src/ -RUN mkdir -p /var/www/html/clients/darwin && \ - mkdir -p /var/www/html/clients/linux && \ - mkdir -p /var/www/html/clients/windows +RUN mkdir -p $APP_ROOT/src/clients/darwin && \ + mkdir -p $APP_ROOT/src/clients/linux && \ + mkdir -p $APP_ROOT/src/clients/windows -COPY --from=downloads /downloads/rekor/rekor_cli_darwin_amd64.gz /var/www/html/clients/darwin/rekor-cli-amd64.gz -COPY --from=downloads /downloads/rekor/rekor_cli_darwin_arm64.gz /var/www/html/clients/darwin/rekor-cli-arm64.gz -COPY --from=downloads /downloads/rekor/rekor_cli_linux_amd64.gz /var/www/html/clients/linux/rekor-cli-amd64.gz -COPY --from=downloads /downloads/rekor/rekor_cli_linux_arm64.gz /var/www/html/clients/linux/rekor-cli-arm64.gz -COPY --from=downloads /downloads/rekor/rekor_cli_linux_ppc64le.gz /var/www/html/clients/linux/rekor-cli-ppc64le.gz -COPY --from=downloads /downloads/rekor/rekor_cli_linux_s390x.gz /var/www/html/clients/linux/rekor-cli-s390x.gz -COPY --from=downloads /downloads/rekor/rekor_cli_windows_amd64.exe.gz /var/www/html/clients/windows/rekor-cli-amd64.gz +COPY --from=downloads /downloads/rekor/rekor_cli_darwin_amd64.gz $APP_ROOT/src/clients/darwin/rekor-cli-amd64.gz +COPY --from=downloads /downloads/rekor/rekor_cli_darwin_arm64.gz $APP_ROOT/src/clients/darwin/rekor-cli-arm64.gz +COPY --from=downloads /downloads/rekor/rekor_cli_linux_amd64.gz $APP_ROOT/src/clients/linux/rekor-cli-amd64.gz +COPY --from=downloads /downloads/rekor/rekor_cli_linux_arm64.gz $APP_ROOT/src/clients/linux/rekor-cli-arm64.gz +COPY --from=downloads /downloads/rekor/rekor_cli_linux_ppc64le.gz $APP_ROOT/src/clients/linux/rekor-cli-ppc64le.gz +COPY --from=downloads /downloads/rekor/rekor_cli_linux_s390x.gz $APP_ROOT/src/clients/linux/rekor-cli-s390x.gz +COPY --from=downloads /downloads/rekor/rekor_cli_windows_amd64.exe.gz $APP_ROOT/src/clients/windows/rekor-cli-amd64.gz -COPY --from=downloads /downloads/ec/ec_darwin_amd64.gz /var/www/html/clients/darwin/ec-amd64.gz -COPY --from=downloads /downloads/ec/ec_darwin_arm64.gz /var/www/html/clients/darwin/ec-arm64.gz -COPY --from=downloads /downloads/ec/ec_linux_amd64.gz /var/www/html/clients/linux/ec-amd64.gz -COPY --from=downloads /downloads/ec/ec_linux_arm64.gz /var/www/html/clients/linux/ec-arm64.gz -COPY --from=downloads /downloads/ec/ec_linux_ppc64le.gz /var/www/html/clients/linux/ec-ppc64le.gz -COPY --from=downloads /downloads/ec/ec_linux_s390x.gz /var/www/html/clients/linux/ec-s390x.gz -COPY --from=downloads /downloads/ec/ec_windows_amd64.exe.gz /var/www/html/clients/windows/ec-amd64.gz - -CMD run-httpd +COPY --from=downloads /downloads/ec/ec_darwin_amd64.gz $APP_ROOT/src/clients/darwin/ec-amd64.gz +COPY --from=downloads /downloads/ec/ec_darwin_arm64.gz $APP_ROOT/src/clients/darwin/ec-arm64.gz +COPY --from=downloads /downloads/ec/ec_linux_amd64.gz $APP_ROOT/src/clients/linux/ec-amd64.gz +COPY --from=downloads /downloads/ec/ec_linux_arm64.gz $APP_ROOT/src/clients/linux/ec-arm64.gz +COPY --from=downloads /downloads/ec/ec_linux_ppc64le.gz $APP_ROOT/src/clients/linux/ec-ppc64le.gz +COPY --from=downloads /downloads/ec/ec_linux_s390x.gz $APP_ROOT/src/clients/linux/ec-s390x.gz +COPY --from=downloads /downloads/ec/ec_windows_amd64.exe.gz $APP_ROOT/src/clients/windows/ec-amd64.gz LABEL \ com.redhat.component="trusted-artifact-signer-serve-cli-container-re" \