diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 5364b38..52a9b11 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -14,8 +14,8 @@ jobs: - name: Check out repository code uses: actions/checkout@v4 - 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 -f docker-compose-dev.yml up -d --build + run: docker compose up -d --build dev if: gitea.ref == 'refs/heads/develop' \ No newline at end of file diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml deleted file mode 100644 index cae1de5..0000000 --- a/docker-compose-dev.yml +++ /dev/null @@ -1,9 +0,0 @@ -services: - web: - container_name: dev.martials.no - restart: always - build: - context: . - dockerfile: Dockerfile - ports: - - "4322:4321" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 5535c45..f653e4c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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" \ No newline at end of file + - "4321:4321" + + dev: + hostname: dev.martials.no + container_name: "dev.martials.no" + restart: always + build: + context: . + dockerfile: Dockerfile + ports: + - "4322:4321" \ No newline at end of file