Tag workflow dispatch with PR (#42)

Author: KevinMind

.github/actions/build/action.yml

@@ -19,6 +19,12 @@ outputs:
   version:
     description: "The version for the image"
     value: ${{ steps.meta.outputs.version }}
+  image:
+    description: "The Docker image"
+    value: ${{ steps.image.outputs.image }}
+  image_version:
+    description: "Combines image and version to a valid image tag"
+    value: ${{ steps.image.outputs.image }}:${{ steps.meta.outputs.version }}
 
 runs:
   using: "composite"
@@ -42,39 +48,22 @@ runs:
         username: ${{ inputs.username }}
         password: ${{ inputs.password }}
 
-    - name: Docker Tag
-      id: tag
+    - name: Docker Image
+      id: image
       shell: bash
       run: |
-        function export_tag() {
-          echo "tag=$1" >> $GITHUB_OUTPUT
-          exit 0
-        }
-
-        if [[ ${{ github.event_name }} == 'pull_request' ]]; then
-          export_tag "type=ref,event=pr"
-        elif [[ ${{ github.event_name }} == 'merge_group' ]]; then
-          export_tag "type=raw,value=staging"
-        elif [[ ${{ github.event_name }} == 'push' ]]; then
-          if [[ ${{ github.ref }} == 'refs/heads/main' ]]; then
-            export_tag "type=raw,value=latest"
-          else
-            export_tag "type=sha"
-          fi
-        fi
-
-        echo "No tag found, exiting."
-        echo "event_name: ${{ github.event_name }}"
-        echo "ref: ${{ github.ref }}"
-
-        exit 1
+        echo "image=ghcr.io/mozilla/test-github-features" >> $GITHUB_OUTPUT
 
     - name: Docker meta
       id: meta
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/mozilla/test-github-features
-        tags: ${{ steps.tag.outputs.tag }}
+        images: ${{ steps.image.outputs.image }}
+        tags: |
+          type=raw,value=latest,enable={{is_default_branch}}
+          type=raw,value=staging,enable=${{ github.event_name == 'merge_group' }}
+          type=ref,event=pr
+          type=sha
 
     - name: Build Image
       uses: docker/build-push-action@v5

.github/workflows/deploy.development.yml

@@ -28,7 +28,7 @@ jobs:
         uses: ./.github/actions/deploy
         with:
           environment: development
-          image: ${{ steps.build.outputs.tags }}
+          image: ${{ steps.build.outputs.image_version }}
           version: ${{ steps.build.outputs.version }}
           fly_token: ${{ secrets.FLY_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/deploy.production.yml

@@ -28,7 +28,7 @@ jobs:
         uses: ./.github/actions/deploy
         with:
           environment: production
-          image: ${{ steps.build.outputs.tags }}
+          image: ${{ steps.build.outputs.image_version }}
           version: ${{ steps.build.outputs.version }}
           fly_token: ${{ secrets.FLY_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/deploy.staging.yml

@@ -26,7 +26,7 @@ jobs:
         uses: ./.github/actions/deploy
         with:
           environment: staging
-          image: ${{ steps.build.outputs.tags }}
+          image: ${{ steps.build.outputs.image_version }}
           version: ${{ steps.build.outputs.version }}
           fly_token: ${{ secrets.FLY_TOKEN }}
           slack_webhook_url: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Test
       uses: ./.github/actions/run
       with:
-        image: ${{ steps.build.outputs.tags }}
+        image: ${{ steps.build.outputs.image_version }}
         run: |
           echo "Testing"
           npm ci
@@ -28,7 +28,7 @@ jobs:
     - name: Lint
       uses: ./.github/actions/run
       with:
-        image: ${{ steps.build.outputs.tags }}
+        image: ${{ steps.build.outputs.image_version }}
         run: |
           echo "Linting"
           npm ci

Dockerfile

@@ -24,6 +24,3 @@ RUN npm i --omit=dev --no-save
 
 EXPOSE 3000
 
-
-CMD ["npm", "run", "start"]
-

fly-development.toml

@@ -21,3 +21,6 @@ primary_region = 'ams'
   memory = '1gb'
   cpu_kind = 'shared'
   cpus = 1
+
+[experimental]
+  cmd = ["npm", "run", "start"]

fly-production.toml

@@ -21,3 +21,6 @@ primary_region = 'ams'
   memory = '1gb'
   cpu_kind = 'shared'
   cpus = 1
+
+[experimental]
+  cmd = ["npm", "run", "start"]

fly-staging.toml

@@ -21,3 +21,6 @@ primary_region = 'ams'
   memory = '1gb'
   cpu_kind = 'shared'
   cpus = 1
+
+[experimental]
+  cmd = ["npm", "run", "start"]