From b32e7b53ec616dfe15ff8991f94f3012890940fd Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Wed, 29 Dec 2021 18:24:38 +0800
Subject: [PATCH] docker: update instructions

---
 install/docker/backend/Dockerfile    |  3 ++-
 install/docker/backend/entrypoint.sh |  5 -----
 install/docker/docker-compose.yml    | 12 +++++++-----
 install/docker/judge/entrypoint.sh   |  5 -----
 install/docker/judge/judge.yaml      | 10 +++++-----
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/install/docker/backend/Dockerfile b/install/docker/backend/Dockerfile
index 656f9751..a76290a6 100644
--- a/install/docker/backend/Dockerfile
+++ b/install/docker/backend/Dockerfile
@@ -1,5 +1,6 @@
 FROM node:14
 ADD ./entrypoint.sh /root/entrypoint.sh
 RUN yarn global add pm2 hydrooj @hydrooj/ui-default
-RUN chmod +x /root/entrypoint.sh
+RUN chmod +x /root/entrypoint.sh && \
+    mkdir -p /root/.hydro
 ENTRYPOINT /root/entrypoint.sh
diff --git a/install/docker/backend/entrypoint.sh b/install/docker/backend/entrypoint.sh
index c1f9f0d2..e65aa608 100644
--- a/install/docker/backend/entrypoint.sh
+++ b/install/docker/backend/entrypoint.sh
@@ -1,22 +1,17 @@
 #!/bin/sh
 
 ROOT=/root/.hydro
-mkdir -p $ROOT
 
 if [ ! -f "$ROOT/addon.json" ]; then
     echo '["@hydrooj/ui-default"]' > "$ROOT/addon.json"
 fi
 
 if [ ! -f "$ROOT/config.json" ]; then
-    # TODO 变成变量
     echo '{"host": "oj-mongo", "port": "27017", "name": "hydro", "username": "", "password": ""}' > "$ROOT/config.json"
 fi
 
 if [ ! -f "$ROOT/first" ]; then
     echo "for marking use only!" > "$ROOT/first"
-	hydrooj cli system set file.accessKey "$ACCESS_KEY"
-    hydrooj cli system set file.secretKey "$SECRET_KEY"
-    # TODO 变成变量
     hydrooj cli system set file.endPoint http://oj-minio:9000/
 
     hydrooj cli user create systemjudge@systemjudge.local root rootroot
diff --git a/install/docker/docker-compose.yml b/install/docker/docker-compose.yml
index d6d50364..e9052be1 100644
--- a/install/docker/docker-compose.yml
+++ b/install/docker/docker-compose.yml
@@ -12,6 +12,8 @@ services:
       - MINIO_ACCESS_KEY=CHANGE_THIS
       - MINIO_SECRET_KEY=CHANGE_THIS
     
+  # Warning: mongodb here is not password-protected.
+  # DO NOT EXPOSE THIS SERVICE TO THE PUBLIC.
   oj-mongo:
     image: mongo
     container_name: oj-mongo
@@ -27,12 +29,12 @@ services:
       - oj-minio
       - oj-mongo
     volumes:
-      - ./data/backend/config:/root/.hydro
+      - ./data/backend:/root/.hydro
     environment:
-      - ACCESS_KEY=CHANGE_THIS
-      - SECRET_KEY=CHANGE_THIS
+      - MINIO_ACCESS_KEY=CHANGE_THIS
+      - MINIO_SECRET_KEY=CHANGE_THIS
     ports:
-      - "0.0.0.0:80:8888"
+      - "0.0.0.0:80:8888" # In docker mode, change THIS port instead of port in system settings!
 
   oj-judge:
     build: ./judge
@@ -42,4 +44,4 @@ services:
     depends_on:
       - oj-backend
     volumes:
-      - ./data/judge/config:/root/.config/hydro
+      - ./data/judge:/root/.config/hydro
diff --git a/install/docker/judge/entrypoint.sh b/install/docker/judge/entrypoint.sh
index e025f635..5b6d9319 100644
--- a/install/docker/judge/entrypoint.sh
+++ b/install/docker/judge/entrypoint.sh
@@ -1,9 +1,4 @@
 #!/bin/sh
 
-ROOT=/root/.config/hydro
-mkdir -p $ROOT
-if [ ! -f "$ROOT/judge.yaml" ]; then
-    cp /root/judge.yaml $ROOT
-fi
 pm2 start sandbox
 pm2-runtime start hydrojudge
diff --git a/install/docker/judge/judge.yaml b/install/docker/judge/judge.yaml
index 5a0a7e74..d5d9b375 100644
--- a/install/docker/judge/judge.yaml
+++ b/install/docker/judge/judge.yaml
@@ -1,7 +1,7 @@
 hosts:
   localhost:
-    type: hydro # vj4 用户请在此处填写 vj4
-    server_url: http://oj-backend:8888/ # Hydro 运行的网址
-    uname: root # 评测账号用户名
-    password: rootroot # 评测账号密码
-    detail: true # 默认为 true
+    type: hydro
+    server_url: http://oj-backend:8888/
+    uname: root
+    password: rootroot
+    detail: true