From 333f4be921ae79427f2fdd1a29ffaa73252e1c67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 09:05:28 +0000 Subject: [PATCH 1/2] Bump python from 3.12.1-slim-bullseye to 3.12.2-slim-bullseye Bumps python from 3.12.1-slim-bullseye to 3.12.2-slim-bullseye. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- dodona-assembly.dockerfile | 2 +- dodona-bash.dockerfile | 2 +- dodona-c.dockerfile | 2 +- dodona-compilers.dockerfile | 2 +- dodona-html.dockerfile | 2 +- dodona-python.dockerfile | 2 +- dodona-sqlite.dockerfile | 2 +- dodona-tested.dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dodona-assembly.dockerfile b/dodona-assembly.dockerfile index 1f9d7cf..943dfc0 100644 --- 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 diff --git a/dodona-bash.dockerfile b/dodona-bash.dockerfile index 37fd237..ee48b92 100644 --- 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 index 69f8d61..c17ed7a 100644 --- 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 index 8a322a4..3e0b6bd 100644 --- 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 index 7544bfb..7290bdc 100644 --- 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 index 68dc34d..ed131f3 100644 --- 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-sqlite.dockerfile b/dodona-sqlite.dockerfile index 180b41b..17e398b 100644 --- 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 index 1624a34..92d8fa1 100644 --- 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 From 553a2be60160dc6c95505d1599c16931c61c5954 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 13 Feb 2024 10:08:02 +0100 Subject: [PATCH 2/2] Fix failing images --- dodona-assembly.dockerfile | 4 ++-- dodona-r.dockerfile | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dodona-assembly.dockerfile b/dodona-assembly.dockerfile index 943dfc0..a11a5f0 100644 --- a/dodona-assembly.dockerfile +++ b/dodona-assembly.dockerfile @@ -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-r.dockerfile b/dodona-r.dockerfile index 7bc09ad..1991823 100644 --- 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/* && \