From 7fb32ee3198b4be7038b9f047f6e5518ce5d8604 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 11 Oct 2023 12:14:15 +0200 Subject: [PATCH] Fix some errors --- dodona-assembly.dockerfile | 8 ++++---- dodona-bash.dockerfile | 4 ++-- dodona-html.dockerfile | 4 ++-- dodona-python.dockerfile | 21 +++++++++++---------- dodona-r.dockerfile | 2 +- dodona-sqlite.dockerfile | 4 ++-- dodona-tested.dockerfile | 2 +- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dodona-assembly.dockerfile b/dodona-assembly.dockerfile index b197fdf..6825ce5 100644 --- a/dodona-assembly.dockerfile +++ b/dodona-assembly.dockerfile @@ -1,17 +1,17 @@ FROM python:3.12.0-slim-bullseye # Add architecture repositories for ARM32 -# hadolint ignore=DL3003 +# hadolint ignore=DL3003,DL3008 RUN dpkg --add-architecture armhf \ && apt-get update \ # Install additional dependencies for fetching and building packages - && apt-get install -y --no-install-recommends curl=7.74.0-1.3+deb11u7 \ + && apt-get install -y --no-install-recommends curl \ # Judge compilation dependencies && apt-get install -y --no-install-recommends gcc=4:10.2.1-1 \ # Runtime dependencies (x86 32-bit) - && apt-get install -y --no-install-recommends libc6-dev-i386=2.31-13+deb11u6 lib32gcc-10-dev=10.2.1-6 \ + && apt-get install -y --no-install-recommends libc6-dev-i386 lib32gcc-10-dev=10.2.1-6 \ # Runtime dependencies (ARM 32-bit) - && apt-get install -y --no-install-recommends libc6:armhf=2.31-13+deb11u6 \ + && 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-armhf-cross=2.31-9cross4 gcc-arm-linux-gnueabihf=4:10.2.1-1 binutils-arm-linux-gnueabihf=2.35.2-2 \ diff --git a/dodona-bash.dockerfile b/dodona-bash.dockerfile index 2236222..45daa34 100644 --- a/dodona-bash.dockerfile +++ b/dodona-bash.dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && \ bsdmainutils=12.1.7+nmu3 \ cowsay=3.03+dfsg2-8 \ chromium \ - curl=7.74.0-1.3+deb11u7 \ + curl \ ed=1.17-1 \ figlet=2.2.5-3+b1 \ file \ @@ -19,7 +19,7 @@ RUN apt-get update && \ gcc-multilib=4:10.2.1-1 \ imagemagick \ inkscape=1.0.2-4 \ - librsvg2-bin=2.50.3+dfsg-1 \ + librsvg2-bin \ poppler-utils=20.09.0-3.1+deb11u1 \ procps \ strace=5.10-1 \ diff --git a/dodona-html.dockerfile b/dodona-html.dockerfile index bb44782..0711fdc 100644 --- a/dodona-html.dockerfile +++ b/dodona-html.dockerfile @@ -12,9 +12,9 @@ RUN apt-get update && \ chown -R runner:runner /home/runner && \ chown -R runner:runner /mnt && \ pip install --no-cache-dir --upgrade \ - beautifulsoup4==4.11.2 \ + beautifulsoup4==4.12.2 \ cssselect==1.2.0 \ - lxml==4.9.2 \ + lxml==4.9.3 \ tinycss2==1.2.1 \ py-emmet==1.2.0 \ html-similarity==0.3.3 \ diff --git a/dodona-python.dockerfile b/dodona-python.dockerfile index 59fb4ae..0558ffa 100644 --- a/dodona-python.dockerfile +++ b/dodona-python.dockerfile @@ -1,5 +1,6 @@ FROM python:3.12.0-slim-bullseye +# hadolint ignore=DL3008 RUN chmod 711 /mnt && \ useradd -m runner && \ apt-get update && \ @@ -8,7 +9,7 @@ RUN chmod 711 /mnt && \ gcc=4:10.2.1-1 \ g++=4:10.2.1-1 \ fontconfig=2.13.1-4.2 \ - libc6-dev=2.31-13+deb11u6 \ + libc6-dev \ libcairo2-dev=1.16.0-5 \ make=4.3-4.1 \ procps=2:3.3.17-5 \ @@ -18,19 +19,19 @@ RUN chmod 711 /mnt && \ apt-get clean && \ # Judge dependencies pip install --no-cache-dir --upgrade \ - Pillow==9.4.0 \ - cairosvg==2.6.0 \ - jsonschema==4.17.3 \ + Pillow==10.0.1 \ + cairosvg==2.7.1 \ + jsonschema==4.19.1 \ mako==1.2.4 \ - psutil==5.9.4 \ - pydantic==1.10.4 \ + psutil==5.9.5 \ + pydantic==2.4.2 \ pyhumps==3.8.0 \ - pylint==2.17.2 \ + pylint==3.0.1 \ pyshp==2.3.1 \ - svg-turtle==0.4.1 \ - typing-inspect==0.8.0 && \ + svg-turtle==0.4.2 \ + typing-inspect==0.9.0 && \ # Exercise dependencies - pip install --no-cache-dir --upgrade numpy==1.24.2 biopython==1.81 sortedcontainers==2.4.0 pandas==1.5.3 + pip install --no-cache-dir --upgrade numpy==1.26.0 biopython==1.81 sortedcontainers==2.4.0 pandas==2.1.1 WORKDIR /tmp diff --git a/dodona-r.dockerfile b/dodona-r.dockerfile index 852c8e6..c494b9b 100644 --- a/dodona-r.dockerfile +++ b/dodona-r.dockerfile @@ -3,7 +3,7 @@ FROM r-base:4.3.1 # hadolint ignore=DL3008 RUN apt-get update && \ apt-get install -y --no-install-recommends \ - default-jdk=2:1.17-74 \ + default-jdk \ libcurl4-openssl-dev \ libfontconfig-dev \ libfreetype-dev \ diff --git a/dodona-sqlite.dockerfile b/dodona-sqlite.dockerfile index a517df3..ff98124 100644 --- a/dodona-sqlite.dockerfile +++ b/dodona-sqlite.dockerfile @@ -13,8 +13,8 @@ RUN apt-get update && \ chown -R runner:runner /home/runner && \ chown -R runner:runner /mnt && \ pip install --no-cache-dir --upgrade \ - pandas==1.5.3 \ - sqlparse==0.4.2 + pandas==2.1.1 \ + sqlparse==0.4.4 USER runner WORKDIR /home/runner/workdir diff --git a/dodona-tested.dockerfile b/dodona-tested.dockerfile index 606e15f..3b4bf95 100644 --- a/dodona-tested.dockerfile +++ b/dodona-tested.dockerfile @@ -12,7 +12,7 @@ RUN mkdir -p /usr/share/man/man1mkdir -p /usr/share/man/man1 \ && apt-get install -y --no-install-recommends \ procps=2:3.3.17-5 \ dos2unix=7.4.1-1 \ - curl=7.74.0-1.3+deb11u7 \ + curl \ zip=3.0-12 \ unzip=6.0-26+deb11u1 \ && curl https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb --output packages-microsoft-prod.deb \