From c12ca4dffae511b362db359075b6f844a021003c Mon Sep 17 00:00:00 2001
From: Derek Roberts <derek.roberts@gmail.com>
Date: Wed, 25 Oct 2023 10:58:12 -0700
Subject: [PATCH] Revert "ci: tagging (#1523)"

This reverts commit 1f3e60cda73c1f03257585e1182e06a7a317576e.
---
 .github/workflows/pr-close.yml | 2 +-
 .github/workflows/pr-open.yml  | 8 ++++++++
 frontend/Dockerfile            | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index edafca19c..4a32d601c 100644
--- a/.github/workflows/pr-close.yml
+++ b/.github/workflows/pr-close.yml
@@ -41,5 +41,5 @@ jobs:
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/${{ matrix.package }}
-          target: ${{ github.sha }}
+          target: ${{ github.event.number }}
           tags: test
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 752c3efbe..751051781 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -67,6 +67,14 @@ jobs:
           triggers: ('${{ matrix.triggers }}/')
           build_context: ${{ matrix.build_context }}
 
+      - name: Tag Docker Images
+        uses: shrink/actions-docker-registry-tag@v3
+        with:
+          registry: ghcr.io
+          repository: ${{ github.repository }}/${{ matrix.package }}
+          target: ${{ github.sha }}
+          tags: ${{ github.event.number }}
+
   # https://github.com/bcgov-nr/action-deployer-openshift
   deploys:
     name: Deploys
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 449329de3..8a9bb1087 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -21,5 +21,5 @@ RUN caddy fmt --overwrite /etc/caddy/Caddyfile
 
 # Ports, health check and non-root user
 EXPOSE 3000 3001
-HEALTHCHECK CMD curl -f http://localhost/:3001/health
+HEALTHCHECK --interval=30s --timeout=3s CMD curl -f http://localhost/:3001/health
 USER 1001