👷 Merge into single docker compose file

This commit is contained in:
2025-07-03 18:54:54 +02:00
parent fa58967164
commit 409c343a1b
3 changed files with 16 additions and 14 deletions

View File

@ -14,8 +14,8 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v4
- name: Build production
run: docker compose up -d --build
run: docker compose up -d --build prod
if: gitea.ref == 'refs/heads/master'
- name: Build develop
run: docker compose -f docker-compose-dev.yml up -d --build
run: docker compose up -d --build dev
if: gitea.ref == 'refs/heads/develop'

View File

@ -1,9 +0,0 @@
services:
web:
container_name: dev.martials.no
restart: always
build:
context: .
dockerfile: Dockerfile
ports:
- "4322:4321"

View File

@ -1,9 +1,20 @@
services:
web:
container_name: martials.no
prod:
hostname: martials.no
container_name: "martials.no"
restart: always
build:
context: .
dockerfile: Dockerfile
ports:
- "4321:4321"
- "4321:4321"
dev:
hostname: dev.martials.no
container_name: "dev.martials.no"
restart: always
build:
context: .
dockerfile: Dockerfile
ports:
- "4322:4321"