diff --git a/.github/workflows/pull_and_run_on_server.yaml b/.github/workflows/pull_and_run_on_server.yaml index e885273..8e8c264 100644 --- a/.github/workflows/pull_and_run_on_server.yaml +++ b/.github/workflows/pull_and_run_on_server.yaml @@ -95,7 +95,4 @@ jobs: docker compose -f docker-compose.stage.yaml exec backend sh -c "export RUN_BOT=false" docker compose -f docker-compose.stage.yaml exec backend python manage.py collectstatic docker compose -f docker-compose.stage.yaml exec backend python manage.py migrate - docker compose -f docker-compose.stage.yaml exec backend locale-gen ru_RU.UTF-8 - docker compose -f docker-compose.stage.yaml exec backend sh -c "export LC_TIME=ru_RU.UTF-8" - docker compose -f docker-compose.stage.yaml exec backend dpkg-reconfigure locales docker compose -f docker-compose.stage.yaml exec backend sh -c "export RUN_BOT=true" diff --git a/infra/stage/docker-compose.stage.yaml b/infra/stage/docker-compose.stage.yaml index 52db5c5..96169a1 100644 --- a/infra/stage/docker-compose.stage.yaml +++ b/infra/stage/docker-compose.stage.yaml @@ -48,6 +48,8 @@ services: depends_on: - backend ports: - - 8001:80 + #- 8001:80 #- 8001:443 + - 443:443 + - 80:80 restart: unless-stopped diff --git a/infra/stage/stage.Dockerfile b/infra/stage/stage.Dockerfile index a92542c..8a7babc 100644 --- a/infra/stage/stage.Dockerfile +++ b/infra/stage/stage.Dockerfile @@ -7,16 +7,6 @@ WORKDIR /app COPY pyproject.toml . COPY poetry.lock . -RUN pip install poetry && \ - apt-get update && \ - apt-get install -y locales && \ - sed -i -e 's/# ru_RU.UTF-8 UTF-8/ru_RU.UTF-8 UTF-8/' /etc/locale.gen && \ - dpkg-reconfigure --frontend=noninteractive locales - -ENV LANG ru_RU.UTF-8 -ENV LC_ALL ru_RU.UTF-8 -ENV LC_TIME ru_RU.UTF-8 - # Copy source code COPY src/. /app/