Sync with domjudge repo

.github/workflows/build_and_push_docker.yml

@@ -0,0 +1,188 @@
+---
+name: 'Build version'
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+    inputs:
+      version:
+        required: false
+
+env:
+  REGISTRY: ghcr.io
+  REPO_NAME: ${{ github.repository }}
+
+jobs:
+  get_version:
+    runs-on: ubuntu-latest
+    outputs:
+        docker_tags: ${{ steps.dowload_domjudge.outputs.docker_tags }}
+        domjudge_cache_key: ${{ steps.domjudge_cache_key.outputs.domjudge_cache_key }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Download Domjudge
+        id: dowload_domjudge
+        run: |
+          FILE="domjudge.tar.gz"
+          REPO="DOMjudge/domjudge"
+          INPUT_VERSION=${{ github.event.inputs.version }}
+          DOCKER_TAGS=( "latest" )
+          DOCKER_TAGS+=( "packaging-$(git rev-parse --short HEAD)" )
+
+          DJ_TAGS=$(curl -s https://api.github.com/repos/${REPO}/git/refs/tags | jq 'reverse | ((.[].ref) / "refs/tags/" )[1]' | rev | cut -c2- | rev | cut -c2-)
+          RELEASE_VERSION=$(echo "${DJ_TAGS}" | head -n 1)
+          TAG_TO_BUILD=""
+
+          if [[ "$INPUT_VERSION" == "" || "$INPUT_VERSION" == "release" || "$INPUT_VERSION" == "$RELEASE_VERSION" ]]; then
+            TAG_TO_BUILD=$RELEASE_VERSION
+            DOCKER_TAGS+=( "$RELEASE_VERSION" )
+          fi
+
+          if [[ "$TAG_TO_BUILD" == "" ]] && echo "$DJ_TAGS" | grep -F -q -x "$INPUT_VERSION"; then
+            TAG_TO_BUILD=$INPUT_VERSION
+            DOCKER_TAGS+=( "$INPUT_VERSION" )
+          fi
+
+          if [[ "$TAG_TO_BUILD" != "" ]]; then
+            echo "DOCKER_TAGS: ${DOCKER_TAGS[*]}"
+            echo "TAG_TO_BUILD: $TAG_TO_BUILD"
+            echo "docker_tags=${DOCKER_TAGS[*]}" >> $GITHUB_OUTPUT
+            wget "https://github.com/${REPO}/archive/refs/tags/${TAG_TO_BUILD}.tar.gz" -O ${FILE}
+            exit 0
+          fi
+
+          DJ_BRANCHES=$(curl -s https://api.github.com/repos/${REPO}/branches | jq '.[].name' | rev | cut -c2- | rev | cut -c2-)
+          BRANCH_TO_BUILD=""
+
+          if [[ "$BRANCH_TO_BUILD" == "" ]] && echo "$DJ_BRANCHES" | grep -F -q -x "$INPUT_VERSION"; then
+            BRANCH_TO_BUILD=$INPUT_VERSION
+            DOCKER_TAGS+=( "$INPUT_VERSION" )
+          fi
+
+          if [[ "$BRANCH_TO_BUILD" != "" ]]; then
+            echo "DOCKER_TAGS: ${DOCKER_TAGS[*]}"
+            echo "BRANCH_TO_BUILD: $BRANCH_TO_BUILD"
+            echo "docker_tags=${DOCKER_TAGS[*]}" >> $GITHUB_OUTPUT
+            wget "https://github.com/${REPO}/archive/refs/heads/${BRANCH_TO_BUILD}.tar.gz" -O ${FILE}
+            exit 0
+          fi
+
+          DJ_COMMITS=$(curl -s https://api.github.com/repos/${REPO}/commits | jq '.[].sha' | rev | cut -c2- | rev | cut -c2-)
+          COMMIT_TO_BUILD=""
+
+          if [[ "$COMMIT_TO_BUILD" == "" ]] && echo "$DJ_COMMITS" | grep -F -q -x "$INPUT_VERSION"; then
+            COMMIT_TO_BUILD=$INPUT_VERSION
+            DOCKER_TAGS+=( "$INPUT_VERSION" )
+          fi
+
+          if [[ "$COMMIT_TO_BUILD" != "" ]]; then
+            echo "DOCKER_TAGS: ${DOCKER_TAGS[*]}"
+            echo "COMMIT_TO_BUILD: $COMMIT_TO_BUILD"
+            echo "docker_tags=${DOCKER_TAGS[*]}" >> $GITHUB_OUTPUT
+            wget "https://github.com/${REPO}/archive/${COMMIT_TO_BUILD}.tar.gz" -O ${FILE}
+            exit 0
+          fi
+
+          exit 1
+      - id: domjudge_cache_key
+        run: echo "domjudge_cache_key=${{ runner.os }}-${{ hashFiles('domjudge.tar.gz') }}" >> $GITHUB_OUTPUT
+      - name: Print docker tags
+        run: echo ${{ steps.dowload_domjudge.outputs.docker_tags }}
+      - uses: actions/cache@v3
+        with:
+          path: domjudge.tar.gz
+          key: ${{ runner.os }}-${{ hashFiles('domjudge.tar.gz') }}
+
+  build_domserver:
+    needs: get_version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - uses: actions/cache@v3
+        with:
+          path: domjudge.tar.gz
+          key: ${{ needs.get_version.outputs.domjudge_cache_key }}
+
+      - run: mv domjudge.tar.gz ./docker
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build container
+        run: |
+          cd ./docker
+          sudo bash -e ./build-domjudge.sh "domjudge/domserver:chipcie"
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker tag and push
+        run: |
+          IMAGE_ID=$(echo ${{ env.REGISTRY }}/${{ env.REPO_NAME }} | tr '[A-Z]' '[a-z]')
+
+          for TAG in ${{ needs.get_version.outputs.docker_tags }}; do
+            docker tag domjudge/domserver:chipcie ${IMAGE_ID}/domserver:$TAG
+            docker push ${IMAGE_ID}/domserver:$TAG
+          done
+
+  build_judgehost:
+    needs: get_version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - uses: actions/cache@v3
+        with:
+          path: domjudge.tar.gz
+          key: ${{ needs.get_version.outputs.domjudge_cache_key }}
+
+      - run: mv domjudge.tar.gz ./docker
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt:latest
+          platforms: all
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build container
+        run: |
+          cd ./docker
+          sudo bash -e ./build-judgehost.sh "domjudge/judgehost:chipcie"
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker tag and push
+        run: |
+          IMAGE_ID=$(echo ${{ env.REGISTRY }}/${{ env.REPO_NAME }} | tr '[A-Z]' '[a-z]')
+
+          for TAG in ${{ needs.get_version.outputs.docker_tags }}; do
+            docker tag domjudge/judgehost:chipcie ${IMAGE_ID}/judgehost:$TAG
+            docker push ${IMAGE_ID}/judgehost:$TAG
+          done

docker/build-judgehost.sh

@@ -12,7 +12,7 @@ docker build -t "${docker_tag}-build" -f judgehost/Dockerfile.build .
 # Build chroot
 builder_name=$(echo "${docker_tag}" | sed 's/[^a-zA-Z0-9_-]/-/g')
 docker rm -f "${builder_name}" > /dev/null 2>&1 || true
-docker run --name "${builder_name}" --cap-add=sys_admin "${docker_tag}-build"
+docker run --privileged --name "${builder_name}" --cap-add=sys_admin "${docker_tag}-build"
 docker cp "${builder_name}:/chroot.tar.gz" .
 docker cp "${builder_name}:/judgehost.tar.gz" .
 docker rm -f "${builder_name}"

docker/domserver/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim AS domserver-build
+FROM debian:bookworm-slim AS domserver-build
 LABEL org.opencontainers.image.authors="DOMjudge team <team@domjudge.org>"
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -12,13 +12,16 @@ RUN apt update \
 	php-gd php-curl php-mysql php-json php-intl \
 	php-gmp php-xml php-mbstring \
 	sudo bsdmainutils ntp libcgroup-dev procps \
-	python3-sphinx python3-sphinx-rtd-theme python3-pygments rst2pdf fontconfig python3-yaml \
+	python3-venv python3-yaml fontconfig \
 	texlive-latex-recommended texlive-latex-extra \
-	texlive-fonts-recommended texlive-lang-european latexmk \
+	texlive-fonts-recommended texlive-lang-european latexmk tex-gyre \
 	libcurl4-gnutls-dev libjsoncpp-dev libmagic-dev \
 	enscript lpr ca-certificates \
 	&& rm -rf /var/lib/apt/lists/*
 
+# Use venv to install latest Sphinx. 6.1.0 or higher is required to build DOMjudge docs.
+RUN python3 -m venv /venv && . /venv/bin/activate && pip3 install sphinx sphinx-rtd-theme rst2pdf
+
 # Set up user
 RUN useradd -m domjudge
 
@@ -31,11 +34,16 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
 ADD domjudge.tar.gz /domjudge-src
 COPY domserver/build.sh /domjudge-src/build.sh
 
+# Apply patches
+COPY domserver/scripts/patches.sh /scripts/patches.sh
+COPY domserver/scripts/patches.d /scripts/patches.d
+RUN chmod 700 /scripts/patches.sh && /scripts/patches.sh
+
 # Build and install domserver
 RUN /domjudge-src/build.sh
 
 # Now create an image with the actual build in it
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 LABEL org.opencontainers.image.authors="DOMjudge team <team@domjudge.org>"
 
 ENV DEBIAN_FRONTEND=noninteractive \
@@ -55,8 +63,10 @@ RUN apt update \
 	nginx php-cli php-fpm php-zip \
 	php-gd php-curl php-mysql php-json php-intl \
 	php-gmp php-xml php-mbstring php-ldap \
-	enscript lpr \
+	enscript \
+	printer-driver-all cups cups-pdf cups-client cups-bsd cups-filters \
 	ca-certificates python3-yaml python3-requests \
+	vim wget httpie \
 	&& rm -rf /var/lib/apt/lists/*
 
 # Install composer

docker/domserver/build.sh

@@ -1,10 +1,13 @@
 #!/bin/sh -eu
 
+# Use venv to use latest Sphinx. 6.1.0 or higher is required to build DOMjudge docs.
+. /venv/bin/activate
+
 cd /domjudge-src/domjudge*
 chown -R domjudge: .
 # If we used a local source tarball, it might not have been built yet
-sudo -u domjudge make dist
-sudo -u domjudge ./configure -with-baseurl=http://localhost/
+sudo -u domjudge sh -c '. /venv/bin/activate && make dist'
+sudo -u domjudge ./configure -with-baseurl=http://dj.chipcie.ch.tudelft.nl/
 
 # Passwords should not be included in the built image. We create empty files here to prevent passwords from being generated.
 sudo -u domjudge touch etc/dbpasswords.secret etc/restapi.secret etc/symfony_app.secret etc/initial_admin_password.secret
@@ -25,5 +28,5 @@ then
 	rm /opt/domjudge/domserver/webapp/.env.local /opt/domjudge/domserver/webapp/.env.local.php
 fi
 
-sudo -u domjudge make docs
+sudo -u domjudge sh -c '. /venv/bin/activate && make docs'
 make install-docs

docker/domserver/configure.sh

@@ -23,7 +23,7 @@ done
 
 # Configure php
 
-php_folder=$(echo "/etc/php/7."?"/")
+php_folder=$(echo "/etc/php/8."?"/")
 php_version=$(basename "$php_folder")
 
 if [ ! -d "$php_folder" ]