Skip to content

TESTING: Migrate Argo CD Dockerfile to use pnpm #1004

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
nmirasch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

TESTING: Migrate Argo CD Dockerfile to use pnpm #1004

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
5 changes: 4 additions & 1 deletion .tekton/argocd-pull-request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ spec:
- linux/x86_64
- name: dockerfile
value: containers/argocd/Dockerfile
# Hermeto does not support pnpm prefetch yet; UI deps are installed during the image build.
- name: hermetic
value: "false"
- name: prefetch-input
value: '[{"type":"gomod","path":"./sources/argo-cd"}, {"type":"yarn","path":"./sources/argo-cd/ui"}, {"type":"gomod","path":"./sources/kustomize/kustomize"}, {"type":"gomod","path":"./sources/helm"}, {"type":"gomod","path":"./sources/git-lfs"}, {"type":"rpm","path":"prefetch/rpms/ubi9"}, {"type":"npm","path":"prefetch/yarn"}]'
value: '[{"type":"gomod","path":"./sources/argo-cd"}, {"type":"gomod","path":"./sources/kustomize/kustomize"}, {"type":"gomod","path":"./sources/helm"}, {"type":"gomod","path":"./sources/git-lfs"}, {"type":"rpm","path":"prefetch/rpms/ubi9"}]'
- name: git-metadata-directories
value:
- sources/argo-cd
Expand Down
5 changes: 4 additions & 1 deletion .tekton/argocd-push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,11 @@ spec:
- '{{target_branch}}'
- name: dockerfile
value: containers/argocd/Dockerfile
# Hermeto does not support pnpm prefetch yet; UI deps are installed during the image build.
- name: hermetic
value: "false"
- name: prefetch-input
value: '[{"type":"gomod","path":"./sources/argo-cd"}, {"type":"yarn","path":"./sources/argo-cd/ui"}, {"type":"gomod","path":"./sources/kustomize/kustomize"}, {"type":"gomod","path":"./sources/helm"}, {"type":"gomod","path":"./sources/git-lfs"}, {"type":"rpm","path":"prefetch/rpms/ubi9"}, {"type":"npm","path":"prefetch/yarn"}]'
value: '[{"type":"gomod","path":"./sources/argo-cd"}, {"type":"gomod","path":"./sources/kustomize/kustomize"}, {"type":"gomod","path":"./sources/helm"}, {"type":"gomod","path":"./sources/git-lfs"}, {"type":"rpm","path":"prefetch/rpms/ubi9"}]'
- name: git-metadata-directories
value:
- sources/argo-cd
Expand Down
4 changes: 2 additions & 2 deletions config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ sources:
commit: fee011bc839911e119c8d774e97308222b4dfa8f
- path: sources/argo-cd
url: https://github.com/argoproj/argo-cd.git
ref: v3.4.2
commit: 0dc6b1b57dd5bb925d5b03c3d09419ab9fb4225e
ref: master
commit: f5f3bf8a064956efd13eb02cc6702319ab564ed6
- path: sources/argo-rollouts
url: https://github.com/argoproj/argo-rollouts.git
ref: v1.8.3
Expand Down
17 changes: 6 additions & 11 deletions containers/argocd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,20 @@ FROM registry.access.redhat.com/ubi9/nodejs-22 AS argocd-ui

USER root

# Install Yarn
WORKDIR /usr/src/app
COPY ["prefetch/yarn/package.json", "prefetch/yarn/package-lock.json", "./"]
RUN npm install --prefer-offline --no-progress --non-interactive
ENV YARN="/usr/src/app/node_modules/.bin/yarn"
RUN $YARN --version
Comment on lines -24 to -29

@svghadi svghadi Jun 15, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to install pnpm in this manner? Ideally we should request the registry.access.redhat.com/ubi9/nodejs-22 maintainers to have pnpm bundled in the image but that will take time.


WORKDIR /usr/src/app/argo-cd/ui

COPY ["sources/argo-cd/ui/package.json", "sources/argo-cd/ui/yarn.lock", "./"]
COPY ["sources/argo-cd/ui/package.json", "sources/argo-cd/ui/pnpm-lock.yaml", "./"]

RUN $YARN install --no-progress --non-interactive --prefer-offline --network-timeout 200000 && \
$YARN cache clean
RUN npm install -g corepack@0.34.6 && \
corepack enable && \
pnpm install --frozen-lockfile

COPY ["sources/argo-cd/ui/", "."]

ARG ARGO_VERSION=latest
ENV ARGO_VERSION=$ARGO_VERSION
RUN NODE_ONLINE_ENV='offline' NODE_ENV='production' $YARN build
ARG TARGETARCH
RUN HOST_ARCH=${TARGETARCH:-amd64} NODE_ENV='production' NODE_ONLINE_ENV='offline' NODE_OPTIONS=--max_old_space_size=8192 pnpm build

####################################################################################################
# Argo CD Build stage which performs the actual build of Argo CD binaries
Expand Down
2 changes: 1 addition & 1 deletion sources/argo-cd
Open in desktop
Submodule argo-cd updated 263 files