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
3 changed files with 22 additions and 9 deletions

View File

@ -4,9 +4,7 @@ on:
push:
branches:
- master
pull_request:
branches:
- master
- develop
jobs:
build:
@ -15,5 +13,9 @@ jobs:
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Run docker-compose
run: docker compose up -d --build
- name: Build production
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:
web:
container_name: martials.no
prod:
hostname: martials.no
container_name: "martials.no"
restart: always
build:
context: .
dockerfile: Dockerfile
ports:
- "4321:4321"
dev:
hostname: dev.martials.no
container_name: "dev.martials.no"
restart: always
build:
context: .
dockerfile: Dockerfile
ports:
- "4322:4321"

View File

@ -8,7 +8,7 @@ let paths: string[]
if (pathname === "/") {
paths = ["~"]
} else {
paths = ["~", ...pathname.split("/").filter(x => x)]
paths = ["~", ...pathname.split("/").slice(1)]
}
function getLink(path: string): NavLink {