Updated docker to Ubuntu 24.04 and fixed stack installation

Author: david-yz-liu

Changelog.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented here.
 ## [unreleased]
 - Install stack with GHCup (#626)
 - Fixed AI tester to report error when the specified `submission` file is not found (#663)
+- Updated docker image to use Ubuntu 24.04 (#667)
+- Fixed stack installation in Docker environment (#667)
 
 ## [v2.8.3]
 - Add troubleshooting section talking about Docker Content Trust (DCT) (#653)

client/.dockerfiles/Dockerfile

@@ -1,7 +1,10 @@
-ARG UBUNTU_VERSION=22.04
+ARG UBUNTU_VERSION=24.04
 
 FROM ubuntu:$UBUNTU_VERSION
 
+# Remove ubuntu user, added in 23.04
+RUN userdel -r ubuntu
+
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
     DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \

compose.yaml

@@ -4,10 +4,10 @@ services:
       context: ./server
       dockerfile: ./.dockerfiles/Dockerfile
       args:
-        UBUNTU_VERSION: '22.04'
+        UBUNTU_VERSION: '24.04'
         LOGIN_USER: 'docker'
         WORKSPACE: '/home/docker/.autotesting'
-    image: markus-autotest-server-dev:1.3.0
+    image: markus-autotest-server-dev:1.4.0
     volumes:
       - ./server:/app:cached
       - venv_server:/home/docker/markus_venv
@@ -28,8 +28,8 @@ services:
       context: ./client
       dockerfile: ./.dockerfiles/Dockerfile
       args:
-        UBUNTU_VERSION: '22.04'
-    image: markus-autotest-client-dev:1.3.0
+        UBUNTU_VERSION: '24.04'
+    image: markus-autotest-client-dev:1.4.0
     container_name: 'autotest-client'
     volumes:
       - ./client:/app:cached

server/.dockerfiles/Dockerfile

@@ -1,7 +1,9 @@
-ARG UBUNTU_VERSION=22.04
+ARG UBUNTU_VERSION=24.04
 
 FROM ubuntu:$UBUNTU_VERSION AS base
 
+# Remove ubuntu user, added in 23.04
+RUN userdel -r ubuntu
 
 ARG LOGIN_USER
 ARG WORKSPACE
@@ -38,18 +40,17 @@ RUN useradd -ms /bin/bash $LOGIN_USER && \
         adduser --disabled-login --no-create-home $worker && \
         echo "$LOGIN_USER ALL=($worker) NOPASSWD:ALL" | EDITOR="tee -a" visudo && \
         usermod -aG $worker $LOGIN_USER; \
-    done
-
-RUN chmod a+x /home/${LOGIN_USER}
+    done && \
+    chmod a+x /home/${LOGIN_USER}
 
 COPY . /app
 
 RUN find /app/autotest_server/testers -name requirements.system -exec {} \;
 
 RUN echo "TZ=$( cat /etc/timezone )" >> /etc/R/Renviron.site
 
-RUN mkdir -p ${WORKSPACE} && chown ${LOGIN_USER} ${WORKSPACE}
-RUN mkdir -p /home/${LOGIN_USER}/markus_venv && chown ${LOGIN_USER} /home/${LOGIN_USER}/markus_venv
+RUN mkdir -p ${WORKSPACE} && chown ${LOGIN_USER} ${WORKSPACE} && \
+    mkdir -p /home/${LOGIN_USER}/markus_venv && chown ${LOGIN_USER} /home/${LOGIN_USER}/markus_venv
 
 WORKDIR /home/${LOGIN_USER}
 

server/autotest_server/testers/haskell/requirements.system

@@ -7,6 +7,7 @@ if ! dpkg -l ghc cabal-install &> /dev/null; then
 fi
 
 if [ ! -x "$HOME/.ghcup/bin/ghcup" ]; then
-  curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
+  BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
   $HOME/.ghcup/bin/ghcup install stack recommended
+  cp $HOME/.ghcup/bin/stack /usr/local/bin/
 fi