File tree Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Expand file tree Collapse file tree 2 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
54
54
# Install required packages for running of domserver
55
55
RUN apt-get update \
56
56
&& apt-get install --no-install-recommends --no-install-suggests -y \
57
- acl zip unzip supervisor mariadb-client apache2-utils \
57
+ acl curl zip unzip supervisor mariadb-client apache2-utils \
58
58
nginx php-cli php-fpm php-zip \
59
59
php-gd php-curl php-mysql php-json php-intl \
60
60
php-gmp php-xml php-mbstring php-ldap \
Original file line number Diff line number Diff line change @@ -13,7 +13,10 @@ for service in "${SERVICES[@]}"; do
13
13
fi
14
14
done
15
15
16
- if php -r ' exit(@file_get_contents("http://localhost/api/") === false ? 1 : 0);' ; then
16
+ # This script has access to $WEBAPP_BASEURL, but not to the sanity checks done by 50-domejudge. So we fallback looking
17
+ # at the configuration file where this path is stored.
18
+ BASEURL=$( grep domjudge.baseurl /opt/domjudge/domserver/webapp/config/static.yaml | awk ' { print $2 }' )
19
+ if curl --silent --fail " $BASEURL /api" > /dev/null; then
17
20
printf " http ok"
18
21
else
19
22
printf " http error"
You can’t perform that action at this time.
0 commit comments