Skip to content

Commit e227604

Browse files
authored
Fix: Docker build failure (ModuleNotFoundError) and cypress tests (#556)
* Fix: Dockerfile * Resolve requested changes * Fix: `cypress-apply-settings` and remove the redundant installation of `gevent==25.5.1`.
1 parent eeb5e62 commit e227604

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

Dockerfile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,16 @@ RUN pip3 install --user bsddb3==6.2.7
5858

5959
WORKDIR /sio2/oioioi
6060

61-
COPY --chown=oioioi:oioioi setup.py requirements.txt ./
62-
RUN pip3 install -r requirements.txt --user filetracker[server]
63-
COPY --chown=oioioi:oioioi requirements_static.txt ./
64-
RUN pip3 install -r requirements_static.txt --user
65-
RUN pip3 install --user -U "gevent==25.5.1" # override version of gevent
61+
COPY --chown=oioioi:oioioi . ./
62+
RUN pip3 install --user -r requirements.txt filetracker[server]
63+
RUN pip3 install --user -r requirements_static.txt
6664

6765
# Installing node dependencies
6866
ENV PATH $PATH:/sio2/oioioi/node_modules/.bin
6967

70-
COPY --chown=oioioi:oioioi package.json package-lock.json ./
7168
RUN npm ci
72-
73-
COPY --chown=oioioi:oioioi . /sio2/oioioi
74-
7569
RUN npm run build
70+
7671
RUN oioioi-create-config /sio2/deployment
7772

7873
WORKDIR /sio2/deployment

easy_toolbox.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"Run coverage tests.",
4646
"{exec} 'web' ../oioioi/test.sh oioioi/problems --cov-report term --cov-report xml:coverage.xml --cov=oioioi {extra_args}",
4747
),
48-
("cypress-apply-settings", "Apply settings for CyPress.", '{exec} web bash -c "echo CAPTCHA_TEST_MODE=True >> settings.py"'),
48+
("cypress-apply-settings", "Apply settings for CyPress.", '{exec} web bash -c "echo >> settings.py && echo CAPTCHA_TEST_MODE=True >> settings.py"'),
4949
("npm", "Run npm command.", "{exec} web npm --prefix ../oioioi {extra_args}"),
5050
("eslint", "Run javascript linter.", "{exec} web npm --prefix ../oioioi run lint"),
5151
(

0 commit comments

Comments
 (0)