Skip to content

Commit 1c60a27

Browse files
authored
Merge pull request #157 from moevm/docker/requirements-fix-#156
Исправление файлов Docker под требования
2 parents 40621bc + 3205bf9 commit 1c60a27

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

backend/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM arangodb:3.12 as arangodb
1+
FROM arangodb:3.12 AS arangodb
22

3-
FROM python:3.12-alpine as final
3+
FROM python:3.12-alpine AS final
44

55
RUN apk add --no-cache \
66
su-exec \
@@ -18,7 +18,6 @@ COPY --from=arangodb /etc/arangodb3 /etc/arangodb3
1818
COPY --from=arangodb /usr/share/arangodb3 /usr/share/arangodb3
1919

2020
# Устанавливаем переменные окружения
21-
ENV ARANGO_NO_AUTH=1
2221
ENV PYTHONDONTWRITEBYTECODE=1
2322
ENV PYTHONUNBUFFERED=1
2423

docker-compose.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
services:
2+
# ArangoDB сервис
23
db:
34
image: arangodb:3.12
45
environment:
@@ -7,16 +8,14 @@ services:
78
- arango_data:/var/lib/arangodb3
89
- arango_apps:/var/lib/arangodb3-apps
910

10-
# Backend сервис
11+
# Backend сервис
1112
backend:
1213
build:
1314
context: ./backend
1415
dockerfile: Dockerfile
1516
container_name: cleanday_backend
1617
ports:
1718
- "127.0.0.1:8000:8000"
18-
volumes:
19-
- ./backend:/app
2019
environment:
2120
- PYTHONPATH=/app
2221
- ARANGO_ROOT_PASSWORD=${ARANGO_ROOT_PASSWORD}
@@ -33,14 +32,11 @@ services:
3332
container_name: cleanday_frontend
3433
ports:
3534
- "127.0.0.1:8080:8080"
36-
volumes:
37-
- ./frontend:/app
38-
- /app/node_modules
3935
environment:
4036
- CHOKIDAR_USEPOLLING=true
4137
depends_on:
4238
- backend
4339

4440
volumes:
4541
arango_data:
46-
arango_apps:
42+
arango_apps:

0 commit comments

Comments
 (0)