diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index b260c38..7a89411 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -10,27 +10,33 @@ concurrency: jobs: lint: runs-on: ubuntu-latest + env: + COMPOSE_PROJECT_NAME: ci-${{ github.run_id }}-${{ github.job }} steps: - uses: actions/checkout@v4 - name: Build - run: docker compose build + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml build - name: Ruff - run: docker compose run --rm web ruff check . + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm web ruff check . typecheck: runs-on: ubuntu-latest + env: + COMPOSE_PROJECT_NAME: ci-${{ github.run_id }}-${{ github.job }} steps: - uses: actions/checkout@v4 - name: Build - run: docker compose build + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml build - name: Mypy - run: docker compose run --rm web mypy apps config + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm web mypy apps config tests: runs-on: ubuntu-latest + env: + COMPOSE_PROJECT_NAME: ci-${{ github.run_id }}-${{ github.job }} steps: - uses: actions/checkout@v4 - name: Build - run: docker compose build + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml build - name: Pytest - run: docker compose run --rm web pytest + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm web pytest diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b260c38..7a89411 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,27 +10,33 @@ concurrency: jobs: lint: runs-on: ubuntu-latest + env: + COMPOSE_PROJECT_NAME: ci-${{ github.run_id }}-${{ github.job }} steps: - uses: actions/checkout@v4 - name: Build - run: docker compose build + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml build - name: Ruff - run: docker compose run --rm web ruff check . + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm web ruff check . typecheck: runs-on: ubuntu-latest + env: + COMPOSE_PROJECT_NAME: ci-${{ github.run_id }}-${{ github.job }} steps: - uses: actions/checkout@v4 - name: Build - run: docker compose build + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml build - name: Mypy - run: docker compose run --rm web mypy apps config + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm web mypy apps config tests: runs-on: ubuntu-latest + env: + COMPOSE_PROJECT_NAME: ci-${{ github.run_id }}-${{ github.job }} steps: - uses: actions/checkout@v4 - name: Build - run: docker compose build + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml build - name: Pytest - run: docker compose run --rm web pytest + run: docker compose -f docker-compose.yml -f docker-compose.ci.yml run --rm web pytest diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml new file mode 100644 index 0000000..c89e948 --- /dev/null +++ b/docker-compose.ci.yml @@ -0,0 +1,7 @@ +services: + web: + volumes: [] + ports: [] + + db: + ports: [] diff --git a/docker-compose.yml b/docker-compose.yml index e43cd69..19ee9da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ services: web: build: . - container_name: nohype-web command: python manage.py runserver 0.0.0.0:8000 volumes: - .:/app @@ -24,13 +23,10 @@ services: db: image: postgres:16-alpine - container_name: nohype-db environment: POSTGRES_DB: nohype POSTGRES_USER: nohype POSTGRES_PASSWORD: nohype - ports: - - "5545:5432" volumes: - nohype_pg:/var/lib/postgresql/data