diff --git a/Dockerfile b/Dockerfile index d7c29c7..077ee2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN sed -i s@/deb.debian.org/@/mirrors.tuna.tsinghua.edu.cn/@g /etc/apt/sources. useradd -u 1000 -ms /bin/bash tt && \ useradd -u 1001 -ms /bin/bash student && \ usermod -aG student tt && \ - echo "student ALL=(tt) NOPASSWD:SETENV:/usr/local/bin/joj3\ntt ALL=(student) NOPASSWD:SETENV:ALL" > /etc/sudoers.d/joj + echo "student ALL=(tt) NOPASSWD:SETENV:/usr/local/bin/joj3,/usr/local/bin/joj3-forge-convert\ntt ALL=(student) NOPASSWD:SETENV:ALL" > /etc/sudoers.d/joj # install joint-teapot && joj3-forge # TODO: change it to FOCS gitea mirror for deployment @@ -19,8 +19,8 @@ RUN pip install --no-cache-dir --break-system-packages \ git+https://ghfast.top/https://github.com/BoYanZh/Joint-Teapot \ git+https://ghfast.top/https://github.com/joint-online-judge/JOJ3-config-generator -# install joj3 & repo-health-checker -COPY bin/joj3 bin/repo-health-checker /usr/local/bin/ +# install joj3 & repo-health-checker & joj3-forge-convert +COPY bin/joj3 bin/repo-health-checker bin/joj3-forge-convert /usr/local/bin/ USER student WORKDIR /home/student diff --git a/Makefile b/Makefile index 2223f38..5d9ffc1 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ prepare: $(MAKE) -C JOJ3 cp JOJ3/build/joj3 JOJ3/build/repo-health-checker bin/ ls -lha bin - upx --best bin/* + upx --best bin/joj3 bin/repo-health-checker ls -lha bin force-build: prepare diff --git a/bin/.gitkeep b/bin/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/bin/joj3-forge-convert b/bin/joj3-forge-convert new file mode 100755 index 0000000..ff3071c --- /dev/null +++ b/bin/joj3-forge-convert @@ -0,0 +1,3 @@ +#!/usr/bin/bash +set -e +joj3-forge convert /home/tt/.config/joj