From 177412d954661603b33df884c92aefa7b66af0e3 Mon Sep 17 00:00:00 2001 From: Divya Upreti Date: Wed, 10 Sep 2025 12:04:37 +0000 Subject: [PATCH] modified all files as per moss --- docker/argo-workflows/3/debian12/3.5/Dockerfile | 12 +++++++----- docker/argo-workflows/3/debian12/3.6/Dockerfile | 12 +++++++----- docker/argo-workflows/templates/Dockerfile.template | 8 +++++--- docker/argo-workflows/versions.yaml | 8 ++++---- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/docker/argo-workflows/3/debian12/3.5/Dockerfile b/docker/argo-workflows/3/debian12/3.5/Dockerfile index d581fe4f50..8efeb82857 100644 --- a/docker/argo-workflows/3/debian12/3.5/Dockerfile +++ b/docker/argo-workflows/3/debian12/3.5/Dockerfile @@ -16,7 +16,9 @@ -FROM marketplace.gcr.io/google/debian12 as ospo +ARG BASE_REGISTRY="docker.io" + +FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo # Download Licenses and restricted source-code COPY components.csv /components.csv @@ -34,7 +36,7 @@ RUN mkdir -p /usr/src/licenses \ && /download-ref-repos.sh /source_code.txt /usr/src # Stage: Server and Workflow Controller: Builder -FROM golang:1.23 as builder +FROM ${BASE_REGISTRY}/golang as builder ARG ARGO_VERSION="3.5.14" ENV ARGO_VERSION "${ARGO_VERSION}" @@ -63,7 +65,7 @@ RUN go mod download # Stage: Server: UI -FROM node:20 as argo-ui +FROM ${BASE_REGISTRY}/node as argo-ui COPY --from=builder /go/src/github.com/argoproj/argo-workflows/ui/package.json ui/ COPY --from=builder /go/src/github.com/argoproj/argo-workflows/ui/yarn.lock ui/ @@ -105,7 +107,7 @@ RUN target=/root/.cache/go-build make dist/argo # Stage: Final Image -FROM marketplace.gcr.io/google/debian12 +FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 COPY --from=ospo /usr/src /usr/src @@ -121,4 +123,4 @@ COPY --chown=8737 --from=workflow-controller-build /go/src/github.com/argoproj/a COPY --from=argocli-build /go/src/github.com/argoproj/argo-workflows/dist/argo /bin/ COPY docker-entrypoint.sh / -ENTRYPOINT [ "/docker-entrypoint.sh" ] +ENTRYPOINT [ "/docker-entrypoint.sh" ] \ No newline at end of file diff --git a/docker/argo-workflows/3/debian12/3.6/Dockerfile b/docker/argo-workflows/3/debian12/3.6/Dockerfile index 7d52df0626..44f732b135 100644 --- a/docker/argo-workflows/3/debian12/3.6/Dockerfile +++ b/docker/argo-workflows/3/debian12/3.6/Dockerfile @@ -16,7 +16,9 @@ -FROM marketplace.gcr.io/google/debian12 as ospo +ARG BASE_REGISTRY="docker.io" + +FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo # Download Licenses and restricted source-code COPY components.csv /components.csv @@ -34,7 +36,7 @@ RUN mkdir -p /usr/src/licenses \ && /download-ref-repos.sh /source_code.txt /usr/src # Stage: Server and Workflow Controller: Builder -FROM golang:1.24 as builder +FROM ${BASE_REGISTRY}/golang as builder ARG ARGO_VERSION="3.6.7" ENV ARGO_VERSION "${ARGO_VERSION}" @@ -63,7 +65,7 @@ RUN go mod download # Stage: Server: UI -FROM node:20 as argo-ui +FROM ${BASE_REGISTRY}/node as argo-ui COPY --from=builder /go/src/github.com/argoproj/argo-workflows/ui/package.json ui/ COPY --from=builder /go/src/github.com/argoproj/argo-workflows/ui/yarn.lock ui/ @@ -105,7 +107,7 @@ RUN target=/root/.cache/go-build make dist/argo # Stage: Final Image -FROM marketplace.gcr.io/google/debian12 +FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 COPY --from=ospo /usr/src /usr/src @@ -121,4 +123,4 @@ COPY --chown=8737 --from=workflow-controller-build /go/src/github.com/argoproj/a COPY --from=argocli-build /go/src/github.com/argoproj/argo-workflows/dist/argo /bin/ COPY docker-entrypoint.sh / -ENTRYPOINT [ "/docker-entrypoint.sh" ] +ENTRYPOINT [ "/docker-entrypoint.sh" ] \ No newline at end of file diff --git a/docker/argo-workflows/templates/Dockerfile.template b/docker/argo-workflows/templates/Dockerfile.template index 91639d21d8..b0ccc0f5a2 100644 --- a/docker/argo-workflows/templates/Dockerfile.template +++ b/docker/argo-workflows/templates/Dockerfile.template @@ -16,6 +16,8 @@ {{ $nodejs := index .Packages "nodejs" }} {{ $golang := index .Packages "golang" }} +ARG BASE_REGISTRY="docker.io" + FROM {{ .From }} as ospo # Download Licenses and restricted source-code @@ -34,7 +36,7 @@ RUN mkdir -p /usr/src/licenses \ && /download-ref-repos.sh /source_code.txt /usr/src # Stage: Server and Workflow Controller: Builder -FROM golang:{{ $golang.Version }} as builder +FROM ${BASE_REGISTRY}/golang as builder ARG ARGO_VERSION="{{ $argo_workflows.Version }}" ENV ARGO_VERSION "${ARGO_VERSION}" @@ -63,7 +65,7 @@ RUN go mod download # Stage: Server: UI -FROM node:{{ $nodejs.Major }} as argo-ui +FROM ${BASE_REGISTRY}/node as argo-ui COPY --from=builder /go/src/github.com/argoproj/argo-workflows/ui/package.json ui/ COPY --from=builder /go/src/github.com/argoproj/argo-workflows/ui/yarn.lock ui/ @@ -121,4 +123,4 @@ COPY --chown=8737 --from=workflow-controller-build /go/src/github.com/argoproj/a COPY --from=argocli-build /go/src/github.com/argoproj/argo-workflows/dist/argo /bin/ COPY docker-entrypoint.sh / -ENTRYPOINT [ "/docker-entrypoint.sh" ] +ENTRYPOINT [ "/docker-entrypoint.sh" ] \ No newline at end of file diff --git a/docker/argo-workflows/versions.yaml b/docker/argo-workflows/versions.yaml index 394327ed02..19f6f8dcd1 100644 --- a/docker/argo-workflows/versions.yaml +++ b/docker/argo-workflows/versions.yaml @@ -14,14 +14,14 @@ cloudbuild: - docker_image: gcr.io/cloud-builders/docker:24.0.9 + docker_image: gcr.io/cloud-builders/docker@sha256:1a9553236b25fd6e1bf2a864c8becb26782c429f4570695b27f4ad6f1a0ed75e enable_parallel: true versions: - annotations: - key: com.googleapis.cloudmarketplace.product.service.name value: services/dea629ec-49b1-439e-928d-1b08fa253321.cloudpartnerservices.goog dir: 3/debian12/3.6 - from: marketplace.gcr.io/google/debian12 + from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 packages: argo_workflows: version: 3.6.7 @@ -42,7 +42,7 @@ versions: - key: com.googleapis.cloudmarketplace.product.service.name value: services/dea629ec-49b1-439e-928d-1b08fa253321.cloudpartnerservices.goog dir: 3/debian12/3.5 - from: marketplace.gcr.io/google/debian12 + from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 packages: argo_workflows: version: 3.5.14 @@ -55,4 +55,4 @@ versions: - 3.5.14-debian12 - 3.5-debian12 - 3.5.14 - - '3.5' + - '3.5' \ No newline at end of file