3 files changed, 19 insertions, 3 deletions
diff --git a/.github/workflows/dev-branch.yml b/.github/workflows/dev-branch.yml
index 95d580a..7198d8e 100644
--- a/.github/workflows/dev-branch.yml
+++ b/.github/workflows/dev-branch.yml
@@ -86,5 +86,5 @@ jobs:
         with:
           push: true
           context: .
-          file: Dockerfile.dev
+          file: ./docker/dev/Dockerfile
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/pico-web-dev:latest
diff --git a/.github/workflows/main-branch.yml b/.github/workflows/main-branch.yml
index f19976d..9c933ef 100644
--- a/.github/workflows/main-branch.yml
+++ b/.github/workflows/main-branch.yml
@@ -5,7 +5,7 @@ on:
       - main
 jobs:
   Build-docker-and-push:
-    name: Build the docker container image and push it to dockerhub
+    name: Build the production docker container image and push it to dockerhub
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -18,6 +18,8 @@ jobs:
       - uses: docker/build-push-action@v5
         with:
           push: true
+          context: .
+          file: ./docker/prod/Dockerfile
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/pico-web-server:latest
 
   Release:
@@ -30,4 +32,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
         with:
-          bump_version_scheme: minor
+          bump_version_scheme: norelease # PR must have one of these labels: release:major, release:minor, release:patch
diff --git a/.github/workflows/main-pr.yml b/.github/workflows/main-pr.yml
new file mode 100644
index 0000000..c122af8
--- /dev/null
+++ b/.github/workflows/main-pr.yml
@@ -0,0 +1,14 @@
+name: Check for release label inside pull request
+on:
+  pull_request:
+    types: [opened, edited, ready_for_review, review_requested]
+    branches:
+      - 'main'
+jobs:
+  has_release_label:
+    if: ! contains(github.event.pull_request.labels.*.name, 'release:major') &&
+        ! contains(github.event.pull_request.labels.*.name, 'release:minor') &&
+        ! contains(github.event.pull_request.labels.*.name, 'release:patch')
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 1