From ee49b2c777cfe6102af7ba1540fa0cd85cbff98b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C5=A9=20Tr=C6=B0=E1=BB=9Dng=20Giang?= <84860408+giorzang@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:26:10 +0700 Subject: [PATCH 1/2] fix tiervnoj: No Module named 'distutils' --- .docker/tiervnoj/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.docker/tiervnoj/Dockerfile b/.docker/tiervnoj/Dockerfile index 913ec97e5..807d204f2 100644 --- a/.docker/tiervnoj/Dockerfile +++ b/.docker/tiervnoj/Dockerfile @@ -41,6 +41,7 @@ ENV PATH="/opt/kotlin/bin:/opt/pypy2/bin:/opt/pypy3/bin:/home/judge/.cargo/bin:$ RUN mkdir /judge /problems && cd /judge && \ curl -L https://github.com/VNOI-Admin/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \ python3 -m venv --prompt=DMOJ /env && \ + /env/bin/pip3 install setuptools && \ /env/bin/pip3 install cython && \ /env/bin/pip3 install -e . && \ /env/bin/python3 setup.py develop && \ From c10baadce7d0c79fa840c70ced5cbf99ef2269a7 Mon Sep 17 00:00:00 2001 From: Le Bao Hiep Date: Wed, 7 Aug 2024 00:26:50 +0700 Subject: [PATCH 2/2] Install setuptools for all tiers --- .docker/tier1/Dockerfile | 2 +- .docker/tier2/Dockerfile | 2 +- .docker/tier3/Dockerfile | 2 +- .docker/tiericpc/Dockerfile | 2 +- .docker/tiervnoj/Dockerfile | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.docker/tier1/Dockerfile b/.docker/tier1/Dockerfile index 53e8a5ffc..36a712448 100644 --- a/.docker/tier1/Dockerfile +++ b/.docker/tier1/Dockerfile @@ -16,7 +16,7 @@ RUN ARCH=$([ $(uname -m) = "x86_64" ] && echo "amd64" || echo "arm64") && \ RUN mkdir /judge /problems && cd /judge && \ curl -L https://github.com/VNOI-Admin/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \ python3 -m venv --prompt=DMOJ /env && \ - /env/bin/pip3 install cython && \ + /env/bin/pip3 install cython setuptools && \ /env/bin/pip3 install -e . && \ /env/bin/python3 setup.py develop && \ HOME=~judge . ~judge/.profile && \ diff --git a/.docker/tier2/Dockerfile b/.docker/tier2/Dockerfile index 86710fcac..9adb217e3 100644 --- a/.docker/tier2/Dockerfile +++ b/.docker/tier2/Dockerfile @@ -16,7 +16,7 @@ RUN ARCH=$([ $(uname -m) = "x86_64" ] && echo "amd64" || echo "arm64") && \ RUN mkdir /judge /problems && cd /judge && \ curl -L https://github.com/VNOI-Admin/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \ python3 -m venv --prompt=DMOJ /env && \ - /env/bin/pip3 install cython && \ + /env/bin/pip3 install cython setuptools && \ /env/bin/pip3 install -e . && \ /env/bin/python3 setup.py develop && \ HOME=~judge . ~judge/.profile && \ diff --git a/.docker/tier3/Dockerfile b/.docker/tier3/Dockerfile index 0249e3c5d..a9898f93e 100644 --- a/.docker/tier3/Dockerfile +++ b/.docker/tier3/Dockerfile @@ -16,7 +16,7 @@ RUN ARCH=$([ $(uname -m) = "x86_64" ] && echo "amd64" || echo "arm64") && \ RUN mkdir /judge /problems && cd /judge && \ curl -L https://github.com/VNOI-Admin/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \ python3 -m venv --prompt=DMOJ /env && \ - /env/bin/pip3 install cython && \ + /env/bin/pip3 install cython setuptools && \ /env/bin/pip3 install -e . && \ /env/bin/python3 setup.py develop && \ HOME=~judge . ~judge/.profile && \ diff --git a/.docker/tiericpc/Dockerfile b/.docker/tiericpc/Dockerfile index 9290a14d9..2f21dfe56 100644 --- a/.docker/tiericpc/Dockerfile +++ b/.docker/tiericpc/Dockerfile @@ -5,7 +5,7 @@ ARG TAG=master RUN mkdir /judge /problems && cd /judge && \ curl -L https://github.com/VNOI-Admin/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \ python3 -m venv --prompt=DMOJ /env && \ - /env/bin/pip3 install cython && \ + /env/bin/pip3 install cython setuptools && \ /env/bin/pip3 install -e . && \ /env/bin/python3 setup.py develop && \ HOME=~judge . ~judge/.profile && \ diff --git a/.docker/tiervnoj/Dockerfile b/.docker/tiervnoj/Dockerfile index 807d204f2..856d536c9 100644 --- a/.docker/tiervnoj/Dockerfile +++ b/.docker/tiervnoj/Dockerfile @@ -41,8 +41,7 @@ ENV PATH="/opt/kotlin/bin:/opt/pypy2/bin:/opt/pypy3/bin:/home/judge/.cargo/bin:$ RUN mkdir /judge /problems && cd /judge && \ curl -L https://github.com/VNOI-Admin/judge-server/archive/"${TAG}".tar.gz | tar -xz --strip-components=1 && \ python3 -m venv --prompt=DMOJ /env && \ - /env/bin/pip3 install setuptools && \ - /env/bin/pip3 install cython && \ + /env/bin/pip3 install cython setuptools && \ /env/bin/pip3 install -e . && \ /env/bin/python3 setup.py develop && \ HOME=~judge . ~judge/.profile && \