diff --git a/web/Dockerfile b/web/Dockerfile index 83a98e4..e26e7d4 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -19,9 +19,9 @@ RUN sh web/install.sh -p && echo "\ if [ ! -f \"/var/uoj_data/.UOJSetupDone\" ]; then\n\ cd /opt/uoj/web && sh install.sh -i\n\ fi\n\ -cd /opt/uoj/web && sh install.sh -d\ service ntp start\n\ service apache2 start\n\ +cd /opt/uoj/web && sh install.sh -d\n\ exec bash\n" >/opt/up && chmod +x /opt/up ENV LANG=C.UTF-8 TZ=Asia/Shanghai diff --git a/web/install.sh b/web/install.sh index 37e552a..21ea5ba 100644 --- a/web/install.sh +++ b/web/install.sh @@ -7,10 +7,10 @@ _database_host_="${DATABASE_HOST:-uoj-db}" _database_password_="${DATABASE_PASSWORD:-root}" _judger_socket_port_="${JUDGER_SOCKET_PORT:-2333}" _judger_socket_password_="${JUDGER_SOCKET_PASSWORD:-_judger_socket_password_}" -_salt0_="${SALT0:-_salt0_}" -_salt1_="${SALT1:-_salt1_}" -_salt2_="${SALT2:-_salt2_}" -_salt3_="${SALT3:-_salt3_}" +_salt0_="${SALT_0:-_salt0_}" +_salt1_="${SALT_1:-_salt1_}" +_salt2_="${SALT_2:-_salt2_}" +_salt3_="${SALT_3:-_salt3_}" _uoj_protocol_="${UOJ_PROTOCOL:-http}" getAptPackage(){