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

….2-slim-bullseye Bump python from 3.12.1-slim-bullseye to 3.12.2-slim-bullseye
dodona-edu · Feb 13, 2024 · 17b7b77 · 17b7b77
2 parents 1dc430d + 553a2be
commit 17b7b77
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/dodona-assembly.dockerfile b/dodona-assembly.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.1-slim-bullseye
+FROM python:3.12.2-slim-bullseye
 
 # Add architecture repositories for ARM32
 # hadolint ignore=DL3003,DL3008
@@ -13,11 +13,11 @@ RUN dpkg --add-architecture armhf \
  # Runtime dependencies (ARM 32-bit)
  && apt-get install -y --no-install-recommends libc6:armhf \
  # Added for compiling and running Assembly (x86, x64, ARM, AArch64)
- && apt-get install -y --no-install-recommends libc6-dev-arm64-cross=2.31-9cross4 gcc-aarch64-linux-gnu=4:10.2.1-1 binutils-aarch64-linux-gnu=2.35.2-2 libglib2.0-0=2.66.8-1 \
+ && apt-get install -y --no-install-recommends libc6-dev-arm64-cross=2.31-9cross4 gcc-aarch64-linux-gnu=4:10.2.1-1 binutils-aarch64-linux-gnu=2.35.2-2 libglib2.0-0 \
  && apt-get install -y --no-install-recommends libc6-dev-armhf-cross=2.31-9cross4 gcc-arm-linux-gnueabihf=4:10.2.1-1 binutils-arm-linux-gnueabihf=2.35.2-2 \
  && apt-get install -y --no-install-recommends valgrind=1:3.16.1-1 \
  # Build tools
- && apt-get install -y --no-install-recommends ninja-build=1.10.1-1 bison=2:3.7.5+dfsg-1 flex=2.6.4-8 libglib2.0-dev=2.66.8-1 pkg-config=0.29.2-1 build-essential=12.9 \
+ && apt-get install -y --no-install-recommends ninja-build=1.10.1-1 bison=2:3.7.5+dfsg-1 flex=2.6.4-8 libglib2.0-dev pkg-config=0.29.2-1 build-essential=12.9 \
  # Remove conflict with Valgrind+qemu-user
  && apt-get remove -y binfmt-support \
  # Cleanup package manager files

diff --git a/dodona-bash.dockerfile b/dodona-bash.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.1-slim-bullseye
+FROM python:3.12.2-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.1-slim-bullseye
+FROM python:3.12.2-slim-bullseye
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

diff --git a/dodona-compilers.dockerfile b/dodona-compilers.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.1-slim-bullseye
+FROM python:3.12.2-slim-bullseye
 
 ARG LLVM_VERSION="13.0.0"
 ARG LLVM_SHA256="9680c841b5ceffa51f21d0d2ddd7573447b659d1889b83c153b7473342b22a49"

diff --git a/dodona-html.dockerfile b/dodona-html.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.1-slim-bullseye
+FROM python:3.12.2-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.1-slim-bullseye
+FROM python:3.12.2-slim-bullseye
 
 # hadolint ignore=DL3008
 RUN chmod 711 /mnt && \

diff --git a/dodona-r.dockerfile b/dodona-r.dockerfile
@@ -8,13 +8,14 @@ RUN apt-get update && \
       libfontconfig-dev \
       libfreetype-dev \
       libfribidi-dev \
+      libglpk-dev \
       libgsl-dev \
       libharfbuzz-dev \
       libnlopt-dev \
+      libproc2-0 \
       libssl-dev \
       libtiff5-dev \
       libxml2-dev \
-      libproc2-0 \
       && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* && \

diff --git a/dodona-sqlite.dockerfile b/dodona-sqlite.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.1-slim-bullseye
+FROM python:3.12.2-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.1-slim-bullseye
+FROM python:3.12.2-slim-bullseye
 
 # Environment Kotlin
 ENV SDKMAN_DIR /usr/local/sdkman