Skip to content

changed argo-workflows to become moss compliant #2951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DivyaUpreti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

changed argo-workflows to become moss compliant #2951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions docker/argo-workflows/3/debian12/3.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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

Expand All @@ -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" ]
12 changes: 7 additions & 5 deletions docker/argo-workflows/3/debian12/3.6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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

Expand All @@ -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" ]
8 changes: 5 additions & 3 deletions docker/argo-workflows/templates/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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" ]
8 changes: 4 additions & 4 deletions docker/argo-workflows/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -55,4 +55,4 @@ versions:
- 3.5.14-debian12
- 3.5-debian12
- 3.5.14
- '3.5'
- '3.5'