Skip to content

Commit 4068ce7

Browse files
committed
add fixes
1 parent 5473a38 commit 4068ce7

4 files changed

Lines changed: 37 additions & 25 deletions

File tree

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
FROM dvivanov/wst-base:v0.2
1+
FROM dvivanov/wst-base:v0.3
22

33
LABEL version="0.3"
44
LABEL project="wst"
55

6+
ENV PYTHONPATH="/project/:/project/app/"
7+
68
WORKDIR /project
79

810
COPY requirements.txt ./
9-
RUN python3 -m pip install --no-cache-dir -r requirements.txt
11+
RUN python -m pip install --no-cache-dir -r requirements.txt
1012

1113
COPY . .
1214

13-
ENV PYTHONPATH='/project/:/project/app/'
1415
WORKDIR /project/app

Dockerfile_base

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,41 @@
1+
FROM debian:12-slim
2+
13
ENV LANG=C.UTF-8 \
4+
LC_ALL=C.UTF-8 \
25
DEBIAN_FRONTEND=noninteractive \
36
PIP_DEFAULT_TIMEOUT=120 \
47
PIP_RETRIES=10 \
58
PIP_DISABLE_PIP_VERSION_CHECK=1 \
6-
PIP_INDEX_URL=https://pypi.org/simple
9+
PIP_INDEX_URL=https://pypi.org/simple \
10+
VIRTUAL_ENV=/opt/venv \
11+
PATH="/opt/venv/bin:${PATH}"
712

813
LABEL version="0.3"
914
LABEL project="wst"
1015

16+
WORKDIR /project
17+
1118
RUN apt-get update && apt-get install -y --no-install-recommends \
12-
python3-pip=23.0.1+dfsg-1 \
13-
python3-dev=3.11.2-1+b1 \
14-
ffmpeg=7:5.1.8-0+deb12u1 \
15-
libimage-exiftool-perl=12.57+dfsg-1 \
16-
inkscape=1.2.2-2+b1 \
17-
mupdf=1.21.1+ds2-1+deb12u1 \
18-
mupdf-tools=1.21.1+ds2-1+deb12u1 \
19-
libgconf-2-4=3.2.6-8 \
20-
libnss3=2:3.87.1-1+deb12u2 \
21-
libxss1=1:1.2.3-1 \
22-
libmagic1=1:5.44-3 \
23-
nano=7.2-1+deb12u1 \
24-
libreoffice-impress=4:7.4.7-1+deb12u10 \
25-
default-jre=2:1.17-74 \
26-
ca-certificates=20230311+deb12u1 && \
27-
rm -rf /var/lib/apt/lists/*
19+
python3 \
20+
python3-pip \
21+
python3-dev \
22+
python3-venv \
23+
ffmpeg \
24+
libimage-exiftool-perl \
25+
inkscape \
26+
mupdf \
27+
mupdf-tools \
28+
libgconf-2-4 \
29+
libnss3 \
30+
libxss1 \
31+
libmagic1 \
32+
nano \
33+
libreoffice-impress \
34+
default-jre \
35+
ca-certificates \
36+
&& python3 -m venv "${VIRTUAL_ENV}" \
37+
&& python -m pip install --no-cache-dir --upgrade pip setuptools wheel \
38+
&& rm -rf /var/lib/apt/lists/*
2839

2940
COPY requirements.txt ./
30-
RUN python3 -m pip install --no-cache-dir -r requirements.txt
41+
RUN python -m pip install --no-cache-dir -r requirements.txt

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
## Инструкция по полному и частичному запуску приложения
44
- `docker-compose --profile training_profile --profile interview_profile --profile question_generate_profile up --build` - запуск приложения полностью (оба режима)
5-
- `docker-compose up --profile training_profile` - запуск приложения без функционала интервью
6-
- `docker-compose up --profile interview_profile` - запуск приложения без функционала тренировок
5+
- `docker-compose --profile training_profile up --build` - запуск приложения без функционала интервью
6+
- `docker-compose --profile interview_profile up --build` - запуск приложения без функционала тренировок

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
x-wst-service: &wst-service
22
build:
33
context: .
4-
image: wst-image:v0.2
4+
image: wst-image:v0.3
55
restart: always
66

77
services:
@@ -130,4 +130,4 @@ volumes:
130130
nltk_data:
131131
mongo_data:
132132
rut5_model:
133-
research_logs:
133+
research_logs:

0 commit comments

Comments
 (0)