diff --git a/shared.jq b/shared.jq index 2d426d7a..6de2169d 100644 --- a/shared.jq +++ b/shared.jq @@ -11,7 +11,6 @@ def apt_get_dist_clean: # https://launchpad.net/ubuntu/+source/apt # https://packages.ubuntu.com/apt - "noble", # TODO once 2.7.8+ makes it into devel (and images are rebuilt), this should be removed! "mantic", "jammy", "focal", diff --git a/ubuntu/noble/Dockerfile b/ubuntu/noble/Dockerfile index 4d69db6e..ac49db0e 100644 --- a/ubuntu/noble/Dockerfile +++ b/ubuntu/noble/Dockerfile @@ -51,4 +51,4 @@ RUN set -ex; \ xz-utils \ zlib1g-dev \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean diff --git a/ubuntu/noble/curl/Dockerfile b/ubuntu/noble/curl/Dockerfile index 5287cfed..502d25da 100644 --- a/ubuntu/noble/curl/Dockerfile +++ b/ubuntu/noble/curl/Dockerfile @@ -18,4 +18,4 @@ RUN set -eux; \ # https://bugs.debian.org/929417 tzdata \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean diff --git a/ubuntu/noble/scm/Dockerfile b/ubuntu/noble/scm/Dockerfile index 6fa085c0..35fd337a 100644 --- a/ubuntu/noble/scm/Dockerfile +++ b/ubuntu/noble/scm/Dockerfile @@ -17,4 +17,4 @@ RUN set -eux; \ # procps is very common in build systems, and is a reasonably small package procps \ ; \ - rm -rf /var/lib/apt/lists/* + apt-get dist-clean