install: update

install/docker/backend/Dockerfile

@@ -1,9 +1,5 @@
 FROM node:14
-
 ADD ./entrypoint.sh /root/entrypoint.sh
-
 RUN yarn global add pm2 hydrooj @hydrooj/ui-default
-
 RUN chmod +x /root/entrypoint.sh
-
 ENTRYPOINT /root/entrypoint.sh

install/docker/backend/entrypoint.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 ROOT=/root/.hydro
-
 mkdir -p $ROOT
 
 if [ ! -f "$ROOT/addon.json" ]; then

install/docker/judge/Dockerfile

@@ -1,12 +1,5 @@
 FROM node:14
 
-ADD ./entrypoint.sh /root/entrypoint.sh
-ADD ./judge.yaml /root/judge.yaml
-
-RUN yarn global add pm2 @hydrooj/hydrojudge && \
-    wget https://s3.undefined.moe/file/executor-amd64 -O /usr/bin/sandbox && \
-    chmod +x /usr/bin/sandbox
-
 RUN apt-get -qq update && \
     apt-get install -y \
     gcc \
@@ -24,6 +17,12 @@ RUN apt-get -qq update && \
     mono-runtime \
     mono-mcs
 
+ADD ./entrypoint.sh /root/entrypoint.sh
+ADD ./judge.yaml /root/judge.yaml
 RUN chmod +x /root/entrypoint.sh
 
+RUN yarn global add pm2 @hydrooj/hydrojudge && \
+    wget https://s3.undefined.moe/file/executor-amd64 -O /usr/bin/sandbox && \
+    chmod +x /usr/bin/sandbox
+
 ENTRYPOINT /root/entrypoint.sh

install/docker/judge/entrypoint.sh

@@ -1,12 +1,9 @@
 #!/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

install/install.js

@@ -229,7 +229,17 @@ for (let i = 0; i < steps.length; i++) {
                         retry++;
                     } else log.fatal('Error when running %s', op[0]);
                 }
-            } else op[0](op[1]);
+            } else {
+                let res = 'retry';
+                retry = 0;
+                while (res === 'retry') {
+                    if (retry < 30) {
+                        log.warn('Retry...');
+                        res = op[0](op[1]);
+                        retry++;
+                    } else log.fatal('Error installing');
+                }
+            }
         }
     } else log.info('已跳过该步骤 / Step skipped');
 }