From 6fb39bdc0c196fb82d93835e8344d55e29756783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 14:31:03 +0000 Subject: [PATCH 1/3] Bump python from 3.12.0-slim-bullseye to 3.12.1-slim-bullseye Bumps python from 3.12.0-slim-bullseye to 3.12.1-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 6825ce5..1f9d7cf 100644 --- 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 index 45daa34..37fd237 100644 --- 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 index 74bb5f1..69f8d61 100644 --- 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 index 4f335bd..325f29a 100644 --- a/dodona-compilers.dockerfile +++ b/dodona-compilers.dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.0-slim-bullseye +FROM python:3.12.1-slim-bullseye ARG LLVM_VERSION="13.0.0" ARG LLVM_SHA256="9680c841b5ceffa51f21d0d2ddd7573447b659d1889b83c153b7473342b22a49" diff --git a/dodona-html.dockerfile b/dodona-html.dockerfile index 0711fdc..7544bfb 100644 --- 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 index 0558ffa..68dc34d 100644 --- 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-sqlite.dockerfile b/dodona-sqlite.dockerfile index ff98124..180b41b 100644 --- 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 index a3dd9ee..1624a34 100644 --- 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 From c9149707e928c196e784880447bcdb8ff346793a Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 11 Jan 2024 17:05:55 +0100 Subject: [PATCH 2/3] Fix R build --- dodona-r.dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dodona-r.dockerfile b/dodona-r.dockerfile index 6144223..7bc09ad 100644 --- 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 && \ From 6b64cfe15ecb5dca25cb55f4f60b2c0bc2c55fde Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 11 Jan 2024 17:09:27 +0100 Subject: [PATCH 3/3] Fix compilers linting errors --- dodona-compilers.dockerfile | 43 +++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/dodona-compilers.dockerfile b/dodona-compilers.dockerfile index 325f29a..8a322a4 100644 --- a/dodona-compilers.dockerfile +++ b/dodona-compilers.dockerfile @@ -3,37 +3,34 @@ 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