👷 Merge into single docker compose file
All checks were successful
Build and deploy website / build (push) Successful in 22s
All checks were successful
Build and deploy website / build (push) Successful in 22s
This commit is contained in:
@ -14,8 +14,8 @@ jobs:
|
|||||||
- name: Check out repository code
|
- name: Check out repository code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Build production
|
- name: Build production
|
||||||
run: docker compose up -d --build
|
run: docker compose up -d --build prod
|
||||||
if: gitea.ref == 'refs/heads/master'
|
if: gitea.ref == 'refs/heads/master'
|
||||||
- name: Build develop
|
- 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'
|
if: gitea.ref == 'refs/heads/develop'
|
@ -1,9 +0,0 @@
|
|||||||
services:
|
|
||||||
web:
|
|
||||||
container_name: dev.martials.no
|
|
||||||
restart: always
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
|
||||||
- "4322:4321"
|
|
@ -1,9 +1,20 @@
|
|||||||
services:
|
services:
|
||||||
web:
|
prod:
|
||||||
container_name: martials.no
|
hostname: martials.no
|
||||||
|
container_name: "martials.no"
|
||||||
restart: always
|
restart: always
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
ports:
|
ports:
|
||||||
- "4321:4321"
|
- "4321:4321"
|
||||||
|
|
||||||
|
dev:
|
||||||
|
hostname: dev.martials.no
|
||||||
|
container_name: "dev.martials.no"
|
||||||
|
restart: always
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
ports:
|
||||||
|
- "4322:4321"
|
Reference in New Issue
Block a user