From 6e2748666f86905c30c3f58fc769126473d76b22 Mon Sep 17 00:00:00 2001 From: John Hao Date: Thu, 24 Jul 2025 17:46:53 -0400 Subject: [PATCH 1/4] change ubuntu references to ubuntu:jammy --- assets/elasticsearch/Dockerfile | 2 +- assets/gzip/Dockerfile | 4 ++-- assets/overhead_test/Dockerfile | 2 +- assets/template/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/elasticsearch/Dockerfile b/assets/elasticsearch/Dockerfile index 6ca38cd..cd0a99f 100644 --- a/assets/elasticsearch/Dockerfile +++ b/assets/elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/y-scope/clp/clp-core-dependencies-x86-ubuntu-jammy:main +from ubuntu:jammy RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ diff --git a/assets/gzip/Dockerfile b/assets/gzip/Dockerfile index 18ea6a5..8b7c41c 100644 --- a/assets/gzip/Dockerfile +++ b/assets/gzip/Dockerfile @@ -2,11 +2,11 @@ # dependencies # If there is any dedicated image available, you should build the benchmarking image on top of that -FROM ghcr.io/y-scope/clp/clp-core-dependencies-x86-ubuntu-jammy:main +FROM ubuntu:jammy # Install necessary packages RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-downgrades \ tmux \ vim \ gzip diff --git a/assets/overhead_test/Dockerfile b/assets/overhead_test/Dockerfile index 2428ce5..3237030 100644 --- a/assets/overhead_test/Dockerfile +++ b/assets/overhead_test/Dockerfile @@ -2,7 +2,7 @@ # dependencies # If there is any dedicated image available, you should build the benchmarking image on top of that -FROM ghcr.io/y-scope/clp/clp-core-dependencies-x86-ubuntu-jammy:main +FROM ubuntu:jammy # Install necessary packages RUN apt-get update \ diff --git a/assets/template/Dockerfile b/assets/template/Dockerfile index 2428ce5..3237030 100644 --- a/assets/template/Dockerfile +++ b/assets/template/Dockerfile @@ -2,7 +2,7 @@ # dependencies # If there is any dedicated image available, you should build the benchmarking image on top of that -FROM ghcr.io/y-scope/clp/clp-core-dependencies-x86-ubuntu-jammy:main +FROM ubuntu:jammy # Install necessary packages RUN apt-get update \ From 0d480b7a179d9ca0ac1e2bc9123b475af3dc2acd Mon Sep 17 00:00:00 2001 From: John Hao Date: Wed, 30 Jul 2025 09:56:09 -0400 Subject: [PATCH 2/4] fix according to coderabbit recommendations --- assets/elasticsearch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/elasticsearch/Dockerfile b/assets/elasticsearch/Dockerfile index cd0a99f..7fb90da 100644 --- a/assets/elasticsearch/Dockerfile +++ b/assets/elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -from ubuntu:jammy +FROM ubuntu:jammy RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \ From 2de68a1d66b4aced13ef1c34cd346c07776dbd23 Mon Sep 17 00:00:00 2001 From: John Hao Date: Wed, 30 Jul 2025 10:23:58 -0400 Subject: [PATCH 3/4] lock gzip version (this was the reason for --allow-downgrades, it was accidentially not included in the original commit) --- assets/gzip/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/gzip/Dockerfile b/assets/gzip/Dockerfile index 8b7c41c..c533c0c 100644 --- a/assets/gzip/Dockerfile +++ b/assets/gzip/Dockerfile @@ -9,5 +9,5 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-downgrades \ tmux \ vim \ - gzip + gzip=1.10-4ubuntu4.1 From a0a0175c4bf6a2ad7b5f93be1d01e2ce60e78047 Mon Sep 17 00:00:00 2001 From: John Hao Date: Sat, 9 Aug 2025 10:21:42 +0800 Subject: [PATCH 4/4] lock gzip version --- assets/gzip/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/gzip/Dockerfile b/assets/gzip/Dockerfile index c533c0c..7835459 100644 --- a/assets/gzip/Dockerfile +++ b/assets/gzip/Dockerfile @@ -2,7 +2,7 @@ # dependencies # If there is any dedicated image available, you should build the benchmarking image on top of that -FROM ubuntu:jammy +FROM ubuntu@sha256:1ec65b2719518e27d4d25f104d93f9fac60dc437f81452302406825c46fcc9cb # Install necessary packages RUN apt-get update \