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