3 Commits

Author SHA1 Message Date
1fa2667deb 👷 Merge into single docker compose file
All checks were successful
Build and deploy website / build (push) Successful in 22s
2025-07-03 18:54:54 +02:00
19d78991c8 👷 Update ref keys and master to develop on develop step
All checks were successful
Build and deploy website / build (push) Successful in 1m3s
2025-07-03 18:39:42 +02:00
1dadaabe94 👷 Staging from develop branch
All checks were successful
Build and deploy website / build (push) Successful in 2s
2025-07-03 18:34:49 +02:00
2 changed files with 21 additions and 8 deletions

View File

@ -4,9 +4,7 @@ on:
push: push:
branches: branches:
- master - master
pull_request: - develop
branches:
- master
jobs: jobs:
build: build:
@ -15,5 +13,9 @@ jobs:
steps: steps:
- name: Check out repository code - name: Check out repository code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Run docker-compose - 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 up -d --build dev
if: gitea.ref == 'refs/heads/develop'

View File

@ -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"