File tree Expand file tree Collapse file tree 3 files changed +13
-10
lines changed
Expand file tree Collapse file tree 3 files changed +13
-10
lines changed Original file line number Diff line number Diff line change 1- ARG BASE_IMAGE=docker.io/library/ubuntu:24 .04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab
1+ ARG BASE_IMAGE=docker.io/library/ubuntu:25 .04@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42
22# ###################################################################################################
33# Builder image
44# Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
@@ -43,19 +43,15 @@ USER root
4343ENV ARGOCD_USER_ID=999 \
4444 DEBIAN_FRONTEND=noninteractive
4545
46- RUN apt-get update && \
47- apt-get install curl -y && \
48- curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
49- apt-get install git-lfs -y && \
50- apt-get remove --purge -y curl && \
51- groupadd -g $ARGOCD_USER_ID argocd && \
46+ RUN groupadd -g $ARGOCD_USER_ID argocd && \
5247 useradd -r -u $ARGOCD_USER_ID -g argocd argocd && \
5348 mkdir -p /home/argocd && \
5449 chown argocd:0 /home/argocd && \
5550 chmod g=u /home/argocd && \
51+ apt-get update && \
5652 apt-get dist-upgrade -y && \
5753 apt-get install -y \
58- git tini gpg tzdata connect-proxy && \
54+ git git-lfs tini gpg tzdata connect-proxy && \
5955 apt-get clean && \
6056 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
6157
Original file line number Diff line number Diff line change @@ -14,9 +14,13 @@ FROM docker.io/library/registry:2.8@sha256:543dade69668e02e5768d7ea2b0aa4fae6aa7
1414
1515FROM docker.io/bitnami/kubectl:1.32@sha256:493d1b871556d48d6b25d471f192c2427571cd6f78523eebcaf4d263353c7487 AS kubectl
1616
17- FROM docker.io/library/ubuntu:24 .04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab
17+ FROM docker.io/library/ubuntu:25 .04@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42
1818
1919ENV DEBIAN_FRONTEND=noninteractive
20+
21+ # NOTE: binutils-gold contains the gold linker, which was recently removed
22+ # from binutils, but is still nesessary for building lint-tools on arm64 only
23+ # until this Golang issue is fixed: https://github.com/golang/go/issues/22040
2024RUN apt-get update && apt-get install --fix-missing -y \
2125 ca-certificates \
2226 curl \
@@ -34,6 +38,9 @@ RUN apt-get update && apt-get install --fix-missing -y \
3438 sudo \
3539 tini \
3640 zip && \
41+ if [ "$(uname -m)" = "aarch64" ]; then \
42+ apt-get install --fix-missing -y binutils-gold; \
43+ fi && \
3744 apt-get clean && \
3845 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
3946
Original file line number Diff line number Diff line change 1- ARG BASE_IMAGE=docker.io/library/ubuntu:24 .04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab
1+ ARG BASE_IMAGE=docker.io/library/ubuntu:25 .04@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42
22
33FROM docker.io/library/golang:1.24.1@sha256:c5adecdb7b3f8c5ca3c88648a861882849cc8b02fed68ece31e25de88ad13418 AS go
44
You can’t perform that action at this time.
0 commit comments