Skip to content

Commit c51e4f7

Browse files
committed
Upgrade gitlabci container to ubuntu 22.04 (jammy)
The default for PHP changes to 8.1. The package php8.1-json is now already provided by both php8.1-{fpm,cli} and became virtual. The npm pa11y tool is now install globally as npm changed its working, given that we run this in CI as either domjudge or root having it globally is actually better.
1 parent 12cb080 commit c51e4f7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ stages:
88

99
variables:
1010
FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: "true" # see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/1736
11-
GITLABCI_VERSION: "2.1"
11+
GITLABCI_VERSION: "22.04"
1212
GITLABCI_IMAGE: "gitlabci"
1313
CONTRIBUTOR_IMAGE: "domjudge/domjudge-contributor"
1414
DOMJUDGE_VERSION:

docker-gitlabci/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22
ENV DEBIAN_FRONTEND=noninteractive
33
ENV PHPSUPPORTED="7.2 7.3 8.0 8.1 8.2"
44
ENV APTINSTALL="apt install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
@@ -7,7 +7,7 @@ RUN apt update && apt install -y \
77
libjsoncpp-dev libmagic-dev autoconf automake bats sudo debootstrap procps \
88
gcc g++ default-jre-headless default-jdk ghc fp-compiler libcgroup-dev \
99
devscripts shellcheck nginx libboost-regex-dev \
10-
php7.4 php7.4-cli php7.4-gd php7.4-curl php7.4-mysql php7.4-json php7.4-gmp php7.4-zip php7.4-xml php7.4-mbstring php7.4-fpm php7.4-intl php7.4-pcov \
10+
php8.1 php8.1-cli php8.1-gd php8.1-curl php8.1-mysql php8.1-gmp php8.1-zip php8.1-xml php8.1-mbstring php8.1-fpm php8.1-intl php8.1-pcov \
1111
# W3c test \
1212
httrack \
1313
# Visual regression browser \
@@ -28,7 +28,7 @@ RUN apt update && apt install -y \
2828
# Code coverage for unit test
2929
php-pear php-dev \
3030
# Needed NPM packages \
31-
&& npm install pa11y \
31+
&& npm install -g pa11y \
3232
# Needed python packages \
3333
&& pip install codespell \
3434
&& rm -rf /var/lib/apt/lists/*
@@ -51,7 +51,7 @@ RUN add-apt-repository ppa:ondrej/php -y && apt update && \
5151
for PACKAGE in $PACKAGES; do \
5252
$APTINSTALL php${VERSION}-${PACKAGE#php*-}; \
5353
done; \
54-
done && update-alternatives --set php /usr/bin/php7.4
54+
done && update-alternatives --set php /usr/bin/php8.1
5555

5656
# Put the gitlab user in sudo
5757
RUN echo 'ALL ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

0 commit comments

Comments
 (0)