From b5414c8d9928f5ca0bb88192303c21b5aa99c146 Mon Sep 17 00:00:00 2001 From: Julian Mundhahs Date: Wed, 4 Dec 2024 14:57:56 +0100 Subject: [PATCH 1/2] Remove unused ppa --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 757cadd258..fa8e692cf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,13 +6,13 @@ ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 ENV LC_CTYPE=C.UTF-8 ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y software-properties-common wget && add-apt-repository -y ppa:mhier/libboost-latest # Install the packages needed for building the binaries (this is a separate # stage to keep the final image small). FROM base AS builder ARG TARGETPLATFORM ENV DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y wget RUN wget https://apt.kitware.com/kitware-archive.sh && chmod +x kitware-archive.sh && ./kitware-archive.sh RUN apt-get update && apt-get install -y build-essential cmake libicu-dev tzdata pkg-config uuid-runtime uuid-dev git libjemalloc-dev ninja-build libzstd-dev libssl-dev libboost1.83-dev libboost-program-options1.83-dev libboost-iostreams1.83-dev libboost-url1.83-dev From 3004b63785892ba0222a45a8ee45349fdb5ce5bb Mon Sep 17 00:00:00 2001 From: Julian Mundhahs Date: Wed, 4 Dec 2024 14:58:32 +0100 Subject: [PATCH 2/2] Use non-dev packages and remove unused packages in final image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fa8e692cf9..554435a4b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN if [ $TARGETPLATFORM = "linux/arm64" ] ; then echo "Skipping tests for ARM64 FROM base AS runtime WORKDIR /qlever ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y wget python3-yaml unzip curl bzip2 pkg-config libicu-dev python3-icu libgomp1 uuid-runtime make lbzip2 libjemalloc-dev libzstd-dev libssl-dev libboost1.83-dev libboost-program-options1.83-dev libboost-iostreams1.83-dev libboost-url1.83-dev pipx bash-completion vim sudo && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y wget python3-yaml unzip curl bzip2 pkg-config libicu74 python3-icu libgomp1 uuid-runtime make lbzip2 libjemalloc2 libzstd1 libboost-program-options1.83.0 libboost-iostreams1.83.0 libboost-url1.83.0 pipx bash-completion vim sudo && rm -rf /var/lib/apt/lists/* # Set up user `qlever` with temporary sudo rights (which will be removed again # by the `docker-entrypoint.sh` script, see there).