From e0908c57a879fe9f06538a44c9e11874335a9f2f Mon Sep 17 00:00:00 2001
From: Martin Berg Alstad <git@martials.no>
Date: Thu, 3 Jul 2025 18:34:49 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20Staging=20from=20develop=20branc?=
 =?UTF-8?q?h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yaml | 8 +++++---
 docker-compose-dev.yml       | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 docker-compose-dev.yml

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index dd53777..4e80271 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -4,9 +4,7 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    branches:
-      - master
+      - develop
 
 jobs:
   build:
@@ -17,3 +15,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Run docker-compose
         run: docker compose up -d --build
+        if: github.ref == 'refs/heads/master'
+      - name: Run docker-compose
+        run: docker compose -f docker-compose-dev.yml up -d --build
+        if: github.ref == 'refs/heads/master'
\ No newline at end of file
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
new file mode 100644
index 0000000..cae1de5
--- /dev/null
+++ b/docker-compose-dev.yml
@@ -0,0 +1,9 @@
+services:
+  web:
+    container_name: dev.martials.no
+    restart: always
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "4322:4321"
\ No newline at end of file