From 46b03e3535a19ce9047e3a5ef1c36932de6b2c90 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Tue, 11 Jul 2023 13:54:08 +0100 Subject: [PATCH 1/3] Use bookworm for docker image base --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 91d6e60f..ab5d56de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:15-bullseye +FROM postgres:15-bookworm # this allows the setup to ignore all of the ubuntu OS setup # thats not needed for this docker image (Time Zone for example) ARG DEBIAN_FRONTEND=noninteractive @@ -12,7 +12,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone # Add Node.js repo RUN curl -sL https://deb.nodesource.com/setup_19.x | bash - -RUN sh -c 'echo "deb http://cloud.r-project.org/bin/linux/debian bullseye-cran40/" > /etc/apt/sources.list.d/r-project.list' && \ +RUN sh -c 'echo "deb http://cloud.r-project.org/bin/linux/debian bookworm-cran40/" > /etc/apt/sources.list.d/r-project.list' && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7' From 0fd94b1023ea26556d1073d9f082e1fb4c63e54f Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Tue, 11 Jul 2023 13:54:22 +0100 Subject: [PATCH 2/3] Switch to Node.js 20 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ab5d56de..947cd1d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV TZ=UTC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone # Add Node.js repo -RUN curl -sL https://deb.nodesource.com/setup_19.x | bash - +RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - RUN sh -c 'echo "deb http://cloud.r-project.org/bin/linux/debian bookworm-cran40/" > /etc/apt/sources.list.d/r-project.list' && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7' From 526f296e25b5c5714cb6c6299c16be416b616758 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Tue, 11 Jul 2023 15:27:52 +0100 Subject: [PATCH 3/3] Override pip rejecting the install --- Dockerfile.rebench | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.rebench b/Dockerfile.rebench index 7fd7267f..fc205f32 100644 --- a/Dockerfile.rebench +++ b/Dockerfile.rebench @@ -2,7 +2,7 @@ FROM rebenchdb:latest RUN apt-get install -y git python3-pip -RUN pip install git+https://github.com/smarr/ReBench.git +RUN pip install --break-system-packages git+https://github.com/smarr/ReBench.git RUN echo 'echo Starting PostgreSQL Server\n\ docker-entrypoint.sh postgres &\n\