Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump TESTed stuff #320

Merged
merged 3 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ jobs:
- uses: brpaz/hadolint-action@master
with:
dockerfile: dodona-${{ matrix.image }}.dockerfile
ignore: DL3008
2 changes: 1 addition & 1 deletion dodona-assembly.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.12.3-slim-bullseye

# Add architecture repositories for ARM32
# hadolint ignore=DL3003,DL3008
# hadolint ignore=DL3003
RUN dpkg --add-architecture armhf \
&& apt-get update \
# Install additional dependencies for fetching and building packages
Expand Down
1 change: 0 additions & 1 deletion dodona-bash.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM python:3.12.3-slim-bullseye

# hadolint ignore=DL3008
RUN apt-get update && \
apt-get -y install --no-install-recommends \
bc=1.07.1-2+b2 \
Expand Down
2 changes: 1 addition & 1 deletion dodona-compilers.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG LLVM_VERSION="13.0.0"
ARG LLVM_SHA256="9680c841b5ceffa51f21d0d2ddd7573447b659d1889b83c153b7473342b22a49"


# hadolint ignore=DL3008,DL3013,DL4006
# hadolint ignore=DL3013,DL4006
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
cmake \
g++ \
Expand Down
1 change: 0 additions & 1 deletion dodona-haskell.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM haskell:9.8.2

# hadolint ignore=DL3008
RUN apt-get update \
# Install jq for json querying in bash
# Install freeglut headers for gloss compilation
Expand Down
1 change: 0 additions & 1 deletion dodona-python.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM python:3.12.3-slim-bullseye

# hadolint ignore=DL3008
RUN chmod 711 /mnt && \
useradd -m runner && \
apt-get update && \
Expand Down
1 change: 0 additions & 1 deletion dodona-r.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM r-base:4.4.0

# hadolint ignore=DL3008
RUN apt-get update && \
apt-get install -y --no-install-recommends \
default-jdk \
Expand Down
42 changes: 24 additions & 18 deletions dodona-tested.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ FROM python:3.12.3-slim-bullseye

# Environment Kotlin
ENV SDKMAN_DIR /usr/local/sdkman
ENV HASKELL_DIR /usr/local/ghcupdir
ENV PATH $SDKMAN_DIR/candidates/kotlin/current/bin:$PATH
ENV PATH $SDKMAN_DIR/candidates/java/current/bin:$PATH
ENV PATH $HASKELL_DIR/ghc/bin:$PATH
ENV PATH $HASKELL_DIR/cabal:$PATH
ENV NODE_PATH /usr/lib/node_modules
# Add manual directory for default-jdk
# hadolint ignore=DL3008
RUN mkdir -p /usr/share/man/man1mkdir -p /usr/share/man/man1 \
&& apt-get update \
# Install additional dependencies
Expand All @@ -17,41 +20,44 @@ RUN mkdir -p /usr/share/man/man1mkdir -p /usr/share/man/man1 \
unzip \
# Bash language dependencies
bc binutils bsdmainutils cowsay ed figlet file toilet tree vim xxd \
# Dependencies for GHCup
autoconf build-essential zlib1g-dev libgmp-dev \
&& curl https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb --output packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb \
# Add nodejs v18
&& bash -c 'set -o pipefail && curl -fsSL https://deb.nodesource.com/setup_18.x | bash -' \
# Install programming languages \
# JavaScript dependencies
&& bash -c 'set -o pipefail && curl -fsSL https://deb.nodesource.com/setup_22.x | bash -' \
# Haskell dependencies
&& bash -c "set -o pipefail && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh" \
&& bash -c "source /root/.ghcup/env && ghcup install ghc 9.6 --isolate $HASKELL_DIR/ghc" \
&& bash -c "source /root/.ghcup/env && ghcup install cabal --isolate $HASKELL_DIR/cabal" \
# Install programming languages \
&& apt-get install -y --no-install-recommends \
# TESTed Java and Kotlin judge dependency
openjdk-17-jdk \
checkstyle=8.36.1-1 \
# TESTed Haskell judge dependency
haskell-platform=2014.2.0.0.debian8 \
hlint=3.1.6-1 \
# Checkstyle, other Java stuff uses SDKMAN! below
checkstyle \
hlint \
# TESTed C judge dependency
gcc=4:10.2.1-1 \
cppcheck=2.3-1 \
gcc \
cppcheck \
# TESTed Javascript judge dependency
nodejs \
# TESTed bash judge dependency
shellcheck=0.7.1-1+deb11u1 \
shellcheck \
# C# dependency
dotnet-sdk-6.0=6.0.405-1 \
dotnet-sdk-8.0 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
# TESTed Judge depencencies
&& pip install --no-cache-dir --upgrade psutil==5.9.5 attrs==23.1.0 cattrs==23.1.2 jsonschema==4.19.1 typing_inspect==0.9.0 pyyaml==6.0.1 Pygments==2.16.1 python-i18n==0.3.9 pylint==3.0.1 \
&& pip install --no-cache-dir --upgrade psutil==5.9.8 attrs==23.2.0 cattrs==23.2.3 jsonschema==4.22.0 typing_inspect==0.9.0 pyyaml==6.0.1 Pygments==2.18.0 python-i18n==0.3.9 pylint==3.0.1 \
# TESTed Kotlin judge dependencies
&& bash -c 'set -o pipefail && curl -s "https://get.sdkman.io?rcupdate=false" | bash' \
&& chmod a+x "$SDKMAN_DIR/bin/sdkman-init.sh" \
&& bash -c "source \"$SDKMAN_DIR/bin/sdkman-init.sh\" && sdk install kotlin 1.8.0" \
&& curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.48.2/ktlint \
&& bash -c "source \"$SDKMAN_DIR/bin/sdkman-init.sh\" && sdk install java 21.0.3-tem && sdk install kotlin" \
&& curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.2.1/ktlint \
&& chmod a+x ktlint \
&& mv ktlint /usr/local/bin \
# JavaScript dependencies
&& npm install -g eslint@8.36 abstract-syntax-tree@2.17.6 \
&& npm install -g eslint@8.57 abstract-syntax-tree@2.22 \
# Haskell dependencies
&& cabal update \
&& cabal v1-install --global aeson \
Expand Down
Loading