diff --git a/Dockerfile b/Dockerfile index e2eed1e..dcfa4e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,14 @@ -FROM python:3.12-alpine +FROM python:3.11-slim WORKDIR /app +COPY . /app -COPY . /app +RUN #pip3 install -r requirements.txt -RUN apk add --no-cache gcc musl-dev libffi-dev mariadb-connector-c-dev pkgconfig +RUN --mount=type=cache,id=custom-pip,target=/root/.cache/pip pip install -r requirements.txt -RUN pip install --no-cache-dir -r requirements.txt +#RUN chmod +x entrypoint -EXPOSE 8000 +#CMD ["./entrypoint"] -CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"] \ No newline at end of file +CMD ["python3", "manage.py", "runserver", "0:8000"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 31ea142..a52d38d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,9 +1,28 @@ services: - web_service: - build: . - command: python manage.py runserver 0.0.0.0:8000 + django_service: + build: + context: . + dockerfile: ./Dockerfile + command: python3 manage.py runserver 0:8099 ports: - - "8000:8000" + - 8001:8033 volumes: - - .:/app - working_dir: /app \ No newline at end of file + - static_volume:/app/static + - media_volume:/app/media + env_file: .env + depends_on: + - mysql_service + + mysql_service: + image: mysql:alpine + environment: + - MYSQL_PASSWORD=1 + ports: + - 5433:5432 + volumes: + - new_pg_data:/var/lib/mysql/data + +volumes: + new_pg_data: + static_volume: + media_volume: \ No newline at end of file