Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions docker/argo-workflows/3/debian12/3.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

ARG BASE_REGISTRY="docker.io"

FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0 as ospo

# Download Licenses and restricted source-code
COPY components.csv /components.csv
Expand All @@ -36,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 docker.io/golang as builder
FROM docker.io/library/golang:1.25-bookworm as builder

ARG ARGO_VERSION="3.5.14"
ENV ARGO_VERSION "${ARGO_VERSION}"
Expand Down Expand Up @@ -65,10 +65,10 @@ RUN go mod download


# Stage: Server: UI
FROM docker.io/node as argo-ui
FROM docker.io/library/node:20-bookworm as argo-ui

# Install yarn globally
RUN npm install -g yarn
RUN npm install -g yarn --force

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 @@ -110,7 +110,13 @@ RUN target=/root/.cache/go-build make dist/argo


# Stage: Final Image
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

# Patch critical CVEs in base OS layer
RUN apt-get update && apt-get install -y --only-upgrade \
perl \
zlib1g \
&& rm -rf /var/lib/apt/lists/*

COPY --from=ospo /usr/src /usr/src

Expand Down
16 changes: 11 additions & 5 deletions docker/argo-workflows/3/debian12/3.6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

ARG BASE_REGISTRY="docker.io"

FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0 as ospo

# Download Licenses and restricted source-code
COPY components.csv /components.csv
Expand All @@ -36,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 docker.io/golang as builder
FROM docker.io/library/golang:1.25-bookworm as builder

ARG ARGO_VERSION="3.6.7"
ENV ARGO_VERSION "${ARGO_VERSION}"
Expand Down Expand Up @@ -65,10 +65,10 @@ RUN go mod download


# Stage: Server: UI
FROM docker.io/node as argo-ui
FROM docker.io/library/node:20-bookworm as argo-ui

# Install yarn globally
RUN npm install -g yarn
RUN npm install -g yarn --force

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 @@ -110,7 +110,13 @@ RUN target=/root/.cache/go-build make dist/argo


# Stage: Final Image
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

# Patch critical CVEs in base OS layer
RUN apt-get update && apt-get install -y --only-upgrade \
perl \
zlib1g \
&& rm -rf /var/lib/apt/lists/*

COPY --from=ospo /usr/src /usr/src

Expand Down
20 changes: 13 additions & 7 deletions docker/argo-workflows/4/debian12/4.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

ARG BASE_REGISTRY="docker.io"

FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861 as ospo
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0 as ospo

# Download Licenses and restricted source-code
COPY components.csv /components.csv
Expand All @@ -36,9 +36,9 @@ RUN mkdir -p /usr/src/licenses \
&& /download-ref-repos.sh /source_code.txt /usr/src

# Stage: Server and Workflow Controller: Builder
FROM docker.io/golang as builder
FROM docker.io/library/golang:1.25-bookworm as builder

ARG ARGO_VERSION="4.0.6"
ARG ARGO_VERSION="4.0.8"
ENV ARGO_VERSION "${ARGO_VERSION}"

RUN apt-get update && apt-get --no-install-recommends install -y \
Expand All @@ -65,10 +65,10 @@ RUN go mod download


# Stage: Server: UI
FROM docker.io/node as argo-ui
FROM docker.io/library/node:20-bookworm as argo-ui

# Install yarn globally
RUN npm install -g yarn
RUN npm install -g yarn --force

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 @@ -110,11 +110,17 @@ RUN target=/root/.cache/go-build make dist/argo


# Stage: Final Image
FROM marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
FROM marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0

# Patch critical CVEs in base OS layer
RUN apt-get update && apt-get install -y --only-upgrade \
perl \
zlib1g \
&& rm -rf /var/lib/apt/lists/*

COPY --from=ospo /usr/src /usr/src

ENV C2D_RELEASE "4.0.6"
ENV C2D_RELEASE "4.0.8"
USER 8737

# Controller artifacts
Expand Down
12 changes: 9 additions & 3 deletions docker/argo-workflows/templates/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -36,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 docker.io/golang as builder
FROM docker.io/library/golang:{{ $golang.Version }}-bookworm as builder

ARG ARGO_VERSION="{{ $argo_workflows.Version }}"
ENV ARGO_VERSION "${ARGO_VERSION}"
Expand Down Expand Up @@ -65,10 +65,10 @@ RUN go mod download


# Stage: Server: UI
FROM docker.io/node as argo-ui
FROM docker.io/library/node:{{ $nodejs.Major }}-bookworm as argo-ui

# Install yarn globally
RUN npm install -g yarn
RUN npm install -g yarn --force

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 @@ -112,6 +112,12 @@ RUN target=/root/.cache/go-build make dist/argo
# Stage: Final Image
FROM {{ .From }}

# Patch critical CVEs in base OS layer
RUN apt-get update && apt-get install -y --only-upgrade \
perl \
zlib1g \
&& rm -rf /var/lib/apt/lists/*

COPY --from=ospo /usr/src /usr/src

ENV C2D_RELEASE "{{ $argo_workflows.Version }}"
Expand Down
18 changes: 9 additions & 9 deletions docker/argo-workflows/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ versions:
- key: com.googleapis.cloudmarketplace.product.service.name
value: services/dea629ec-49b1-439e-928d-1b08fa253321.cloudpartnerservices.goog
dir: 4/debian12/4.0
from: marketplace.gcr.io/google/debian12@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
argo_workflows:
version: 4.0.6
version: 4.0.8
golang:
version: '1.24'
version: '1.25'
nodejs:
major: '20'
repo: argo-workflows4
tags:
- 4.0.6-debian12
- 4.0.8-debian12
- 4.0-debian12
- 4-debian12
- 4.0.6
- 4.0.8
- '4.0'
- '4'
- latest
Expand All @@ -52,12 +52,12 @@ versions:
- 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@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
argo_workflows:
version: 3.6.7
golang:
version: '1.24'
version: '1.25'
nodejs:
major: '20'
repo: argo-workflows3
Expand All @@ -82,12 +82,12 @@ 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@sha256:f13f9826c524466f844e74534b8add32f51acd2be428b5dee782fe9086e59861
from: marketplace.gcr.io/google/debian12@sha256:c2a5eb3516da4c3bb0cf2d6fea739bd7b2dc7b1ac444b5fbd7c4def2aa57d4a0
packages:
argo_workflows:
version: 3.5.14
golang:
version: '1.23'
version: '1.25'
nodejs:
major: '20'
repo: argo-workflows3
Expand Down
Loading