From 6247c6fd13404e514437130a1a366302f301e3aa Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 14 Feb 2025 11:20:15 -0800 Subject: [PATCH 1/3] Unpin Dockerfile base image and package versions Signed-off-by: Anna Rift --- Dockerfile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b5924858ca4..0eb9766c3ddd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,26 +1,25 @@ # Common stage: install dependencies, set up the Debian image # =========================================================== -FROM debian:11 AS chapel-base +FROM debian:latest AS chapel-base RUN apt-get update && apt-get install -y --no-install-recommends \ bash \ ca-certificates \ - clang-11 \ + clang \ cmake \ curl \ file \ gcc \ git \ g++ \ - libclang-11-dev \ - libclang-cpp11-dev \ + libclang-dev \ + libclang-cpp-dev \ libedit-dev \ libgmp10 \ libgmp-dev \ - llvm-11-dev \ - llvm-11 \ - llvm-11-tools \ + llvm-dev \ + llvm \ locales \ make \ mawk \ @@ -28,7 +27,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ perl \ pkg-config \ protobuf-compiler \ - python-setuptools \ + python3-setuptools \ python3 \ python3-pip \ python3-venv \ From e9fd14e6fdb81278738bf73773d87edf5454fd2d Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 14 Feb 2025 11:24:21 -0800 Subject: [PATCH 2/3] Reorder Dockerfile deps for vague grouping Signed-off-by: Anna Rift --- Dockerfile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0eb9766c3ddd..2f9b9c121cf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,33 +6,33 @@ FROM debian:latest AS chapel-base RUN apt-get update && apt-get install -y --no-install-recommends \ bash \ ca-certificates \ - clang \ - cmake \ curl \ + wget \ file \ - gcc \ + locales \ + libedit-dev \ git \ + mawk \ + make \ + cmake \ + m4 \ + perl \ + pkg-config \ + gcc \ g++ \ + clang \ libclang-dev \ libclang-cpp-dev \ - libedit-dev \ + llvm \ + llvm-dev \ libgmp10 \ libgmp-dev \ - llvm-dev \ - llvm \ - locales \ - make \ - mawk \ - m4 \ - perl \ - pkg-config \ protobuf-compiler \ - python3-setuptools \ python3 \ + python3-dev \ + python3-setuptools \ python3-pip \ python3-venv \ - python3-dev \ - wget \ && rm -rf /var/lib/apt/lists/* # configure locale From 1afab86948eace456804087f24ce22b03eafefea Mon Sep 17 00:00:00 2001 From: Anna Rift Date: Fri, 14 Feb 2025 11:29:15 -0800 Subject: [PATCH 3/3] Generalize comment on excluding .git Signed-off-by: Anna Rift --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2f9b9c121cf3..1edd027776d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,7 +71,7 @@ RUN make cleanall # Hack to get access to Chapel binaries RUN cd $CHPL_HOME/bin && ln -s */* . -# The .git folder is huge and we really don't need it. +# Remove some unneeded files to reduce image size RUN rm -rf .git RUN for subdir in `ls test || true`; do \ if [ "$subdir" != "release" ]; then \