From 87107b8cc26169f88cf5c850e8b25d64323bc8b7 Mon Sep 17 00:00:00 2001
From: LukeGus <bugattiguy527@gmail.com>
Date: Sat, 7 Dec 2024 01:31:37 -0600
Subject: [PATCH] Docker build update #4 (cache and cleanup)

---
 .github/workflows/docker-image.yml | 40 ++++++++++++++----------------
 .idea/workspace.xml                | 26 ++++++++++++++++---
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 3c318227..2bf67272 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -22,6 +22,16 @@ jobs:
         with:
           node-version: '18'
 
+      - name: Cache Node modules
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.npm
+            frontend/node_modules
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('frontend/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-modules-
+
       - name: Install Dependencies and Build Frontend
         run: |
           cd frontend
@@ -53,7 +63,7 @@ jobs:
           fi
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
 
-      - name: Build and Push Docker Image
+      - name: Build and Push Docker Image with Cache
         uses: docker/build-push-action@v2
         with:
           context: .
@@ -61,32 +71,20 @@ jobs:
           push: true
           tags: ghcr.io/${{ env.REPO_OWNER }}/ssh-project:${{ env.IMAGE_TAG }}
           labels: org.opencontainers.image.source=https://github.com/${{ github.repository }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Notify via ntfy
         run: |
           curl -d "Docker image build and push completed successfully for tag: ${{ env.IMAGE_TAG }}" \
           https://ntfy.karmaashomepage.online/ssh-project-build
 
-      - name: Cleanup Docker Images on GHCR
-        run: |
-          # Get the list of images from ghcr.io
-          images=$(curl -s -H "Authorization: Bearer ${{ secrets.GHCR_TOKEN }}" \
-            "https://api.github.com/orgs/${{ github.repository_owner }}/packages/container/ssh-project/versions")
-
-          # Check the response (for debugging)
-          echo "Response from GHCR: $images"
-
-          # List image tags and delete older versions (keep the latest 10)
-          count=0
-          max_images=10
-          for image in $(echo "$images" | jq -r '.[] | .id'); do
-            if [ $count -ge $max_images ]; then
-              echo "Deleting image $image"
-              curl -X DELETE -H "Authorization: Bearer ${{ secrets.GHCR_TOKEN }}" \
-                "https://api.github.com/orgs/${{ github.repository_owner }}/packages/container/ssh-project/versions/$image"
-            fi
-            count=$((count + 1))
-          done
+      - uses: quartx-analytics/ghcr-cleaner@v1
+        with:
+          owner-type: user
+          token: ${{ secrets.PAT_TOKEN }}
+          repository_owner: ${{ github.repository_owner }}
+          delete-untagged: true
 
       - name: Cleanup Docker Images Locally
         run: |
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6633afe7..3ca65457 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="Docker build update">
+    <list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="Docker build update #3">
       <change beforePath="$PROJECT_DIR$/.github/workflows/docker-image.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/docker-image.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
@@ -115,7 +115,7 @@
       <updated>1733439468142</updated>
       <workItem from="1733439479708" duration="5489000" />
       <workItem from="1733448523969" duration="3535000" />
-      <workItem from="1733549186397" duration="6074000" />
+      <workItem from="1733549186397" duration="6475000" />
     </task>
     <task id="LOCAL-00001" summary="Nano zoom fix #11">
       <option name="closed" value="true" />
@@ -229,7 +229,23 @@
       <option name="project" value="LOCAL" />
       <updated>1733555933987</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="Docker build update #2">
+      <option name="closed" value="true" />
+      <created>1733556269270</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1733556269270</updated>
+    </task>
+    <task id="LOCAL-00016" summary="Docker build update #3">
+      <option name="closed" value="true" />
+      <created>1733556428424</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1733556428424</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -269,6 +285,8 @@
     <MESSAGE value="Silent resize cmds &amp; Auto resize terminal #1" />
     <MESSAGE value="Silent resize cmds &amp; Auto resize terminal #2" />
     <MESSAGE value="Docker build update" />
-    <option name="LAST_COMMIT_MESSAGE" value="Docker build update" />
+    <MESSAGE value="Docker build update #2" />
+    <MESSAGE value="Docker build update #3" />
+    <option name="LAST_COMMIT_MESSAGE" value="Docker build update #3" />
   </component>
 </project>
\ No newline at end of file