Merge pull request #307 from dodona-edu/dependabot/docker/python-3.12…

….1-slim-bullseye Bump python from 3.12.0-slim-bullseye to 3.12.1-slim-bullseye
dodona-edu · Jan 11, 2024 · 6148e41 · 6148e41
2 parents 55c1eac + 6b64cfe
commit 6148e41
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 36 deletions.
diff --git a/dodona-assembly.dockerfile b/dodona-assembly.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.0-slim-bullseye
+FROM python:3.12.1-slim-bullseye
 
 # Add architecture repositories for ARM32
 # hadolint ignore=DL3003,DL3008

diff --git a/dodona-bash.dockerfile b/dodona-bash.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.0-slim-bullseye
+FROM python:3.12.1-slim-bullseye
 
 # hadolint ignore=DL3008
 RUN apt-get update && \

diff --git a/dodona-c.dockerfile b/dodona-c.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.0-slim-bullseye
+FROM python:3.12.1-slim-bullseye
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

diff --git a/dodona-compilers.dockerfile b/dodona-compilers.dockerfile
@@ -1,39 +1,36 @@
-FROM python:3.12.0-slim-bullseye
+FROM python:3.12.1-slim-bullseye
 
 ARG LLVM_VERSION="13.0.0"
 ARG LLVM_SHA256="9680c841b5ceffa51f21d0d2ddd7573447b659d1889b83c153b7473342b22a49"
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    cmake                                                               \
-    g++                                                                 \
-    gawk                                                                \
-    gdb                                                                 \
-    git                                                                 \
-    graphviz                                                            \
-    libfmt-dev                                                          \
-    p7zip-full                                                          \
-    pandoc                                                              \
-    python3                                                             \
-    python3-pip                                                         \
-    python3-pygments                                                    \
-    wget                                                                \
-    && rm -rf /var/lib/apt/lists/*
 
-# Install LLVM
-RUN wget -O /clang+llvm.7z https://github.com/thomasfaingnaert/llvm-builds/releases/download/${LLVM_VERSION}/clang+llvm-Release+Asserts-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-20.04.7z && \
+# hadolint ignore=DL3008,DL3013,DL4006
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+    cmake \
+    g++ \
+    gawk \
+    gdb \
+    git \
+    graphviz \
+    libfmt-dev \
+    p7zip-full \
+    pandoc \
+    python3 \
+    python3-pip \
+    python3-pygments \
+    wget && \
+    rm -rf /var/lib/apt/lists/* && \
+    wget -nv -O /clang+llvm.7z https://github.com/thomasfaingnaert/llvm-builds/releases/download/${LLVM_VERSION}/clang+llvm-Release+Asserts-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-20.04.7z && \
     echo "${LLVM_SHA256} /clang+llvm.7z" | sha256sum --check && \
     7z x /clang+llvm.7z -o/opt && \
-    rm /clang+llvm.7z
-
-# Install lit
-RUN pip3 install lit psutil
+    rm /clang+llvm.7z && \
+    pip3 --no-cache-dir install lit psutil
 
 ENV LLVM_ROOT=/opt/clang+llvm-Release+Asserts-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-20.04
 ENV PATH="${LLVM_ROOT}/bin:${PATH}"
 
 # Dodona-specific config
-RUN chmod 711 /mnt
-RUN useradd -m runner
+RUN chmod 711 /mnt && useradd -m runner
 USER runner
 RUN ["mkdir", "/home/runner/workdir"]
 WORKDIR /home/runner/workdir

diff --git a/dodona-html.dockerfile b/dodona-html.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.0-slim-bullseye
+FROM python:3.12.1-slim-bullseye
 
 RUN apt-get update && \
     # install procps, otherwise pkill cannot be not found

diff --git a/dodona-python.dockerfile b/dodona-python.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.0-slim-bullseye
+FROM python:3.12.1-slim-bullseye
 
 # hadolint ignore=DL3008
 RUN chmod 711 /mnt && \

diff --git a/dodona-r.dockerfile b/dodona-r.dockerfile
@@ -7,13 +7,13 @@ RUN apt-get update && \
       libcurl4-openssl-dev \
       libfontconfig-dev \
       libfreetype-dev \
-      libfribidi-dev=1.0.13-3 \
+      libfribidi-dev \
       libgsl-dev \
-      libharfbuzz-dev=8.0.1-1 \
-      libnlopt-dev=2.7.1-5+b1 \
+      libharfbuzz-dev \
+      libnlopt-dev \
       libssl-dev \
-      libtiff5-dev=4.5.1+git230720-1 \
-      libxml2-dev=2.9.14+dfsg-1.3 \
+      libtiff5-dev \
+      libxml2-dev \
       libproc2-0 \
       && \
   apt-get clean && \

diff --git a/dodona-sqlite.dockerfile b/dodona-sqlite.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.0-slim-bullseye
+FROM python:3.12.1-slim-bullseye
 
 RUN apt-get update && \
     # install procps, otherwise pkill cannot be not found

diff --git a/dodona-tested.dockerfile b/dodona-tested.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.0-slim-bullseye
+FROM python:3.12.1-slim-bullseye
 
 # Environment Kotlin
 ENV SDKMAN_DIR /usr/local/sdkman