diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35d641e..87e903a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,11 @@ name: CI-pipeline on: workflow_dispatch: - push: - branches: - - dev - pull_request: branches: - main + types: + - opened jobs: linters: @@ -57,9 +55,6 @@ jobs: Repository: ${{ github.repository }} See changes: https://github.com/${{ github.repository }}/commit/${{github.sha}} - - name: Check fail - run: echo "Unreachable" - - name: Notify in telegram about success uses: appleboy/telegram-action@master with: diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index fb33147..420f996 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -6,6 +6,10 @@ on: - main types: - closed + paths: + - Dockerfile + - requirements.txt + - manage.py jobs: build-and-push: diff --git a/Dockerfile b/Dockerfile index 8a6e1cf..cf734c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,6 @@ WORKDIR /app COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt -COPY ./mysite ./mysite -COPY ./polls ./polls COPY ./manage.py . RUN ./manage.py makemigrations diff --git a/compose.yaml b/compose.yaml index c6e96c4..16a506e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,10 +1,14 @@ services: - app: - container_name: wtukatyr/django-example-app:latest + django-app: + image: wtukatyr/django-example-app:latest + container_name: django-app ports: - "8989:8000" depends_on: - db + volumes: + ./mysite:/app/mysite + ./polls:/app/polls environment: DATABASE_NAME: ${DATABASE_NAME} DATABASE_USERNAME: ${DATABASE_USERNAME} @@ -14,7 +18,9 @@ services: env_file: - .env networks: - - proxy-common + - django_app_network + - proxy_common + db: image: postgres:14 restart: always @@ -30,13 +36,21 @@ services: volumes: - pg-data:/var/lib/postgresql/data environment: - POSTGRES_USER: sa - POSTGRES_PASSWORD: example - POSTGRES_PORT: 5432 + POSTGRES_DB: ${DATABASE_NAME} + POSTGRES_USER: ${DATABASE_USERNAME} + POSTGRES_PASSWORD: ${DATABASE_PASSWORD} + POSTGRES_PORT: ${DATABASE_PORT} + env_file: + - .env + networks: + - django_app_network + - proxy_common volumes: pg-data: networks: + django_app_network: + name: django_app_network proxy_common: external: true diff --git a/mysite/settings.py b/mysite/settings.py index 0a5c1ea..24de387 100644 --- a/mysite/settings.py +++ b/mysite/settings.py @@ -26,7 +26,7 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ["localhost"] +ALLOWED_HOSTS = ["localhost", "app.saccada.xyz"] # Application definition