diff --git a/docker/compose-dev.yaml b/docker/compose-dev.yaml index 883596d..8e78096 100644 --- a/docker/compose-dev.yaml +++ b/docker/compose-dev.yaml @@ -37,8 +37,6 @@ services: depends_on: psql: condition: service_healthy - migration: - condition: service_completed_successfully ports: - "80:8000" entrypoint: ["./entrypoint.sh", "--dev"] @@ -74,8 +72,6 @@ services: depends_on: psql: condition: service_healthy - migration: - condition: service_completed_successfully ports: - "80:8000" @@ -103,31 +99,7 @@ services: retries: 5 ports: - "5432:5432" - - - migration: - profiles: ["prod", "dev"] - image: "${DOCKER_REGISTRY:-local}/migration-tool:${IMAGE_TAG:-local}" - build: - dockerfile: ./docker/dockerfile - context: ../ - target: migration-tool - environment: - - DB_HOST=psql - volumes: - - type: bind - source: ../configs - target: /home/excel-project/configs - - type: bind - source: ../src/migrations - target: /home/excel-project/src/migrations - - depends_on: - - psql - networks: - - backend - - + networks: backend: name: "${BACKEND_NETWORK:-backend_network}" \ No newline at end of file diff --git a/docker/dockerfile b/docker/dockerfile index 36626ab..cfde1ab 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://git.homyk.space/MH.Dmitrii/The_Di WORKDIR /home/excel-project -COPY pyproject.toml poetry.lock docker/entrypoint.sh ./ +COPY pyproject.toml poetry.lock docker/entrypoint.sh alembic.ini ./ RUN chmod +x ./entrypoint.sh @@ -23,7 +23,7 @@ LABEL org.opencontainers.image.source="https://git.homyk.space/MH.Dmitrii/The_Di WORKDIR /home/excel-project -COPY pyproject.toml poetry.lock main.py docker/entrypoint.sh ./ +COPY pyproject.toml poetry.lock main.py docker/entrypoint.sh alembic.ini ./ COPY src/ ./src/ RUN chmod +x ./entrypoint.sh @@ -38,28 +38,4 @@ RUN groupadd --gid 1000 appuser \ USER appuser -ENTRYPOINT ["./entrypoint.sh", "--prod"] - - -FROM python:3.14-slim AS migration-tool - -LABEL org.opencontainers.image.title="The-DisExcel-project" -LABEL org.opencontainers.image.source="https://git.homyk.space/MH.Dmitrii/The_DisExcel_project" - -WORKDIR /home/excel-project - -COPY pyproject.toml poetry.lock alembic.ini ./ -COPY src/models/database_models ./src/models/database_models -COPY src/models/configs_read ./src/models/configs_read - -RUN pip install --no-cache-dir --break-system-packages poetry \ - && poetry config virtualenvs.create false \ - && poetry install --no-root --no-interaction --only main - -RUN groupadd --gid 1000 appuser \ - && useradd --uid 1000 --gid appuser --shell /bin/bash --create-home appuser \ - && chown -R appuser:appuser /home/excel-project - -USER appuser - -CMD ["alembic", "upgrade", "head"] \ No newline at end of file +ENTRYPOINT ["./entrypoint.sh", "--prod"] \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index dffbbed..890e9c0 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -21,6 +21,11 @@ if [ -z "$MODE" ]; then exit 1 fi +if ! alembic upgrade head; then + echo "Migration failed" + exit 1 +fi + if [ "$MODE" = "dev" ]; then WORKERS="${WORKERS:-1}" exec gunicorn \