Merge f39eef51e6 into 86b9b47dd8

docker-compose.development.yml

@@ -77,6 +77,8 @@ services:
     volumes:
       - ./uoj_data/web/data:/var/uoj_data
       - ./uoj_data/web/storage:/opt/uoj/web/app/storage
-      - ./.config.development.php:/opt/uoj/web/app/.config.php
+      - type: bind
+        source: ./.config.development.php
+        target: /opt/uoj/web/app/.config.php
     ports:
       - "80:80"

docker-compose.yml

@@ -53,6 +53,8 @@ services:
     volumes:
       - ./uoj_data/web/data:/var/uoj_data
       - ./uoj_data/web/storage:/opt/uoj/web/app/storage
-      - ./.config.php:/opt/uoj/web/app/.config.php
+      - type: bind
+        source: ./.config.php
+        target: /opt/uoj/web/app/.config.php
     ports:
       - "80:80"

judger/Dockerfile

@@ -4,9 +4,11 @@ SHELL ["/bin/bash", "-c"]
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends gnupg ca-certificates apt-transport-https && \
+    apt-get install -y --no-install-recommends gnupg curl ca-certificates apt-transport-https && \
+    curl https://git.m.ac/api/packages/baoshuo/debian/repository.key -o /etc/apt/trusted.gpg.d/gitmac-baoshuo.asc && \
+    echo "deb https://git.m.ac/api/packages/baoshuo/debian all main" | tee -a /etc/apt/sources.list.d/gitmac-baoshuo.list && \
     apt-get update && \
-    for pkg in vim ntp zip unzip curl wget build-essential fp-compiler python2.7 python3.10 python3-requests libseccomp-dev openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk tzdata; do \
+    for pkg in vim ntp zip unzip wget build-essential fp-compiler s2oj-gcc python2.7 python3.10 python3-requests libseccomp-dev openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk tzdata; do \
         cnt=10 && \
         while ! apt-get install -y "$pkg"; do \
             if [ $cnt -le 0 ]; then \

judger/uoj_judger/include/uoj_run.h

@@ -10,8 +10,8 @@
 #include <stdexcept>
 #include <sys/time.h>
 
-#define UOJ_GCC "/usr/bin/gcc-11"
+#define UOJ_GCC "/usr/local/bin/s2oj-gcc"
-#define UOJ_GPLUSPLUS "/usr/bin/g++-11"
+#define UOJ_GPLUSPLUS "/usr/local/bin/s2oj-g++"
 #define UOJ_PYTHON2_7 "/usr/bin/python2.7"
 #define UOJ_PYTHON3 "/usr/bin/python3.10"
 #define UOJ_FPC "/usr/bin/fpc"

web/Dockerfile

@@ -4,11 +4,13 @@ SHELL ["/bin/bash", "-c"]
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends gnupg ca-certificates apt-transport-https && \
+    apt-get install -y --no-install-recommends gnupg curl ca-certificates apt-transport-https && \
+    curl https://git.m.ac/api/packages/baoshuo/debian/repository.key -o /etc/apt/trusted.gpg.d/gitmac-baoshuo.asc && \
+    echo "deb https://git.m.ac/api/packages/baoshuo/debian all main" | tee -a /etc/apt/sources.list.d/gitmac-baoshuo.list && \
     (echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" | tee /etc/apt/sources.list.d/ondrej-php.list) && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C && \
     apt-get update && \
-    for pkg in php7.4 php7.4-yaml php7.4-xml php7.4-dev php7.4-zip php7.4-mysql php7.4-mbstring php7.4-gd php7.4-curl php7.4-imagick libseccomp-dev git vim ntp zip unzip curl wget apache2 libapache2-mod-xsendfile php-pear mysql-client build-essential fp-compiler re2c libseccomp-dev libyaml-dev python2.7 python3.10 python3-requests openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk language-pack-zh-hans cron tzdata; do \
+    for pkg in php7.4 php7.4-yaml php7.4-xml php7.4-dev php7.4-zip php7.4-mysql php7.4-mbstring php7.4-gd php7.4-curl php7.4-imagick libseccomp-dev git vim ntp zip unzip wget apache2 libapache2-mod-xsendfile php-pear mysql-client build-essential s2oj-gcc fp-compiler re2c libseccomp-dev libyaml-dev python2.7 python3.10 python3-requests openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk language-pack-zh-hans cron tzdata; do \
         cnt=10 && \
         while ! apt-get install -y "$pkg"; do \
             if [ $cnt -le 0 ]; then \