Skip to content

Commit

Permalink
Fix failing images
Browse files Browse the repository at this point in the history
  • Loading branch information
chvp committed Feb 13, 2024
1 parent 333f4be commit 553a2be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions dodona-assembly.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion dodona-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/* && \
Expand Down

0 comments on commit 553a2be

Please sign in to comment.