From d921ec89d11c33fd4e9547932cc7568a29da19d7 Mon Sep 17 00:00:00 2001 From: dudinea Date: Sun, 22 Jun 2025 17:54:39 +0300 Subject: [PATCH] cherry-pick 1b48f36 Upgrade ubuntu base image to latest 25.04 digest Signed-off-by: reggie-k --- Dockerfile | 12 ++++-------- test/container/Dockerfile | 9 ++++++++- test/remote/Dockerfile | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6575b557ef99..f338d3cd13802 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=docker.io/library/ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab +ARG BASE_IMAGE=docker.io/library/ubuntu:25.04@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42 #################################################################################################### # Builder image # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image @@ -43,19 +43,15 @@ USER root ENV ARGOCD_USER_ID=999 \ DEBIAN_FRONTEND=noninteractive -RUN apt-get update && \ - apt-get install curl -y && \ - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \ - apt-get install git-lfs -y && \ - apt-get remove --purge -y curl && \ - groupadd -g $ARGOCD_USER_ID argocd && \ +RUN groupadd -g $ARGOCD_USER_ID argocd && \ useradd -r -u $ARGOCD_USER_ID -g argocd argocd && \ mkdir -p /home/argocd && \ chown argocd:0 /home/argocd && \ chmod g=u /home/argocd && \ + apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y \ - git tini gpg tzdata connect-proxy && \ + git git-lfs tini gpg tzdata connect-proxy && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 97261ad39a526..14d5e5e8e4c1c 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -14,9 +14,13 @@ FROM docker.io/library/registry:2.8@sha256:543dade69668e02e5768d7ea2b0aa4fae6aa7 FROM docker.io/bitnami/kubectl:1.32@sha256:493d1b871556d48d6b25d471f192c2427571cd6f78523eebcaf4d263353c7487 AS kubectl -FROM docker.io/library/ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab +FROM docker.io/library/ubuntu:25.04@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42 ENV DEBIAN_FRONTEND=noninteractive + +# NOTE: binutils-gold contains the gold linker, which was recently removed +# from binutils, but is still nesessary for building lint-tools on arm64 only +# until this Golang issue is fixed: https://github.com/golang/go/issues/22040 RUN apt-get update && apt-get install --fix-missing -y \ ca-certificates \ curl \ @@ -34,6 +38,9 @@ RUN apt-get update && apt-get install --fix-missing -y \ sudo \ tini \ zip && \ + if [ "$(uname -m)" = "aarch64" ]; then \ + apt-get install --fix-missing -y binutils-gold; \ + fi && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/test/remote/Dockerfile b/test/remote/Dockerfile index f04ade3bbc98f..9f8bfa6c1a6ab 100644 --- a/test/remote/Dockerfile +++ b/test/remote/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=docker.io/library/ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab +ARG BASE_IMAGE=docker.io/library/ubuntu:25.04@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42 FROM docker.io/library/golang:1.24.1@sha256:c5adecdb7b3f8c5ca3c88648a861882849cc8b02fed68ece31e25de88ad13418 AS go