From e26d98f8c79f75a760c02e88b794041210ce2f5c Mon Sep 17 00:00:00 2001
From: Jack <jack@3t.network>
Date: Mon, 16 Sep 2024 14:54:16 +0000
Subject: [PATCH 1/2] Improve layer cacheability

---
 Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d0cc9f0..94283c1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,12 +27,13 @@ RUN npm run build
 ################################################
 FROM node:lts-alpine
 
-COPY --from=build /app/package*.json ./
-COPY --from=build /app/dist ./dist
-
 # Install dependencies but skip dev dependencies
+COPY --from=build /app/package*.json ./
 RUN npm install --only=production
 
+# Copy the app
+COPY --from=build /app/dist ./dist
+
 # Start the app
 ENTRYPOINT ["npm", "run"]
 CMD ["start"]
\ No newline at end of file

From e4a391930f9712d856eeee574c49e169683c4b5c Mon Sep 17 00:00:00 2001
From: Jack <jack@3t.network>
Date: Mon, 16 Sep 2024 15:32:55 +0000
Subject: [PATCH 2/2] Trigger Portainer deploy if env var exists

---
 .gitea/workflows/build-and-publish.yml | 30 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/build-and-publish.yml b/.gitea/workflows/build-and-publish.yml
index 7b3f412..54eeb9f 100644
--- a/.gitea/workflows/build-and-publish.yml
+++ b/.gitea/workflows/build-and-publish.yml
@@ -57,16 +57,22 @@ jobs:
           push: true
           tags: ${{ steps.set_tags.outputs.image_tags }}
 
-      # - name: Set Portainer Webhook URL
-      #   run: |
-      #     if [[ "${{ gitea.ref_name }}" == "main" ]]; then
-      #       echo "PORTAINER_WEBHOOK_URL=${{ secrets.PORTAINER_WEBHOOK_URL_MAIN }}" >> $GITHUB_ENV
-      #     elif [[ "${{ gitea.ref_name }}" == "develop" ]]; then
-      #       echo "PORTAINER_WEBHOOK_URL=${{ secrets.PORTAINER_WEBHOOK_URL_DEV }}" >> $GITHUB_ENV
-      #     fi
+      - name: Set Portainer Webhook URL
+        run: |
+          if [[ "${{ gitea.ref_name }}" == "main" ]]; then
+            if [[ -n "${{ secrets.PORTAINER_WEBHOOK_URL_MAIN }}" ]]; then
+              echo "PORTAINER_WEBHOOK_URL=${{ secrets.PORTAINER_WEBHOOK_URL_MAIN }}" >> $GITHUB_ENV
+            fi
+          elif [[ "${{ gitea.ref_name }}" == "develop" ]]; then
+            if [[ -n "${{ secrets.PORTAINER_WEBHOOK_URL_DEV }}" ]]; then
+              echo "PORTAINER_WEBHOOK_URL=${{ secrets.PORTAINER_WEBHOOK_URL_DEV }}" >> $GITHUB_ENV
+            fi
+          fi
 
-      # - name: Trigger Portainer Webhook
-      #   run: |
-      #     curl -X POST --silent --fail "$PORTAINER_WEBHOOK_URL"
-      #   env:
-      #     PORTAINER_WEBHOOK_URL: ${{ env.PORTAINER_WEBHOOK_URL }}
+      - name: Trigger Portainer Webhook
+        run: |
+          if [[ -n "${{ env.PORTAINER_WEBHOOK_URL }}" ]]; then
+            curl -X POST --silent --fail "$PORTAINER_WEBHOOK_URL"
+          fi
+        env:
+          PORTAINER_WEBHOOK_URL: ${{ env.PORTAINER_WEBHOOK_URL }}