From c28f2909a5162e5daf9bb40227be2e86f04735f4 Mon Sep 17 00:00:00 2001 From: Enrico Del Fante Date: Tue, 11 Jun 2024 12:00:05 +0200 Subject: [PATCH 1/2] Update Dockerfile reuse NO_PROXY_CACHE env Signed-off-by: Enrico Del Fante --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ee138afca62..88198f7bf82 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ ENV NO_PROXY_CACHE="-o Acquire::BrokenProxy=true -o Acquire::http::No-Cache=true # Update and install dependencies without using any cache RUN apt-get update $NO_PROXY_CACHE && \ # $NO_PROXY_CACHE must not be used here or otherwise will trigger a hadolint error - apt-get -o Acquire::BrokenProxy=true -o Acquire::http::No-Cache=true -o Acquire::http::Pipeline-Depth=0 \ + apt-get $NO_PROXY_CACHE && \ --no-install-recommends -q --assume-yes install openjdk-21-jre-headless=21* libjemalloc-dev=5.* adduser=3* && \ # Clean apt cache apt-get clean && \ From d9560647d065b38f6922861e49fef8d5b1e77ff7 Mon Sep 17 00:00:00 2001 From: Enrico Del Fante Date: Wed, 12 Jun 2024 09:17:55 +0200 Subject: [PATCH 2/2] Update Dockerfile Signed-off-by: Enrico Del Fante --- docker/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 88198f7bf82..e7878ccdd9b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,13 +5,10 @@ ENV NO_PROXY_CACHE="-o Acquire::BrokenProxy=true -o Acquire::http::No-Cache=true # Update and install dependencies without using any cache RUN apt-get update $NO_PROXY_CACHE && \ - # $NO_PROXY_CACHE must not be used here or otherwise will trigger a hadolint error - apt-get $NO_PROXY_CACHE && \ - --no-install-recommends -q --assume-yes install openjdk-21-jre-headless=21* libjemalloc-dev=5.* adduser=3* && \ + apt-get $NO_PROXY_CACHE --no-install-recommends -q --assume-yes install openjdk-21-jre-headless=21* libjemalloc-dev=5.* adduser=3* && \ # Clean apt cache apt-get clean && \ - rm -rf /var/cache/apt/archives/* /var/cache/apt/archives/partial/* && \ - rm -rf /var/lib/apt/lists/* && \ + rm -rf /var/cache/apt/archives/* && rm -rf /var/lib/apt/lists/* && \ # Ubuntu 23.10 comes with an "ubuntu" user with uid 1000. We need 1000 for besu. userdel ubuntu 2>/dev/null || true && rm -rf /home/ubuntu && \ # Ensure we use a stable UID for besu, as file permissions are tied to UIDs.