From 27437c87ac862f6cb5d9d195132cb245399889e1 Mon Sep 17 00:00:00 2001
From: Marijn Doeve <marijn@doeve.me>
Date: Mon, 21 Aug 2023 23:03:42 +0200
Subject: [PATCH 1/2] New Deploy action

---
 .gitea/workflows/deploy.yml          | 13 +++++++++++++
 .gitea/workflows/release-nightly.yml |  2 --
 .gitea/workflows/release-tag.yml     | 17 +++++++++++++++--
 compose.prod.yaml                    |  2 +-
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 .gitea/workflows/deploy.yml

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
new file mode 100644
index 0000000..a00c10e
--- /dev/null
+++ b/.gitea/workflows/deploy.yml
@@ -0,0 +1,13 @@
+name: Deploy
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_COMPOSE: IMAGE_TAG=${{ gitea.ref_name }} docker compose --ansi=never -f=compose.yaml -f=compose.prod.yaml
+    steps:
diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml
index 0cfbd0c..9a36613 100644
--- a/.gitea/workflows/release-nightly.yml
+++ b/.gitea/workflows/release-nightly.yml
@@ -10,7 +10,6 @@ jobs:
     container:
       image: catthehacker/ubuntu:act-latest
     env:
-      DOCKER_ORG: gitea
       DOCKER_LATEST: nightly
     steps:
       - name: Checkout
@@ -44,7 +43,6 @@ jobs:
           context: .
           file: ./Containerfile
           platforms: |
-            linux/amd64
             linux/arm/v7
           push: true
           tags: |
diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml
index 56d233e..570c1a1 100644
--- a/.gitea/workflows/release-tag.yml
+++ b/.gitea/workflows/release-tag.yml
@@ -11,7 +11,6 @@ jobs:
     container:
       image: catthehacker/ubuntu:act-latest
     env:
-      DOCKER_ORG: marijn
       DOCKER_LATEST: latest
     steps:
       - name: Checkout
@@ -46,9 +45,23 @@ jobs:
           context: .
           file: ./Containerfile
           platforms: |
-            linux/arm64
             linux/arm/v7
           push: true
           tags: |
             gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
             gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+
+      - name: Deploy Image to Sever
+        id: deploy
+        env:
+          DOCKER_COMPOSE: IMAGE_TAG=${{ gitea.ref_name }} docker compose --ansi=never -f=compose.yaml -f=compose.prod.yaml
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.KEY }}
+          port: ${{ secrets.PORT }}
+          script: |
+            cd /opt/projectorpi-web
+            ${{ env.DOCKER_COMPOSE }} pull
+            ${{ env.DOCKER_COMPOSE }} up -d
diff --git a/compose.prod.yaml b/compose.prod.yaml
index a7ae4c9..daf5740 100644
--- a/compose.prod.yaml
+++ b/compose.prod.yaml
@@ -1,3 +1,3 @@
 services:
   app:
-    image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-nightly}
+    image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-latest}
-- 
2.49.1


From cfa0055488db187b7322db45f72070c8b721655f Mon Sep 17 00:00:00 2001
From: Marijn Doeve <marijn@doeve.me>
Date: Mon, 21 Aug 2023 23:15:53 +0200
Subject: [PATCH 2/2] More!

---
 .gitea/workflows/deploy.yml          | 13 -------------
 .gitea/workflows/release-nightly.yml |  2 ++
 .gitea/workflows/release-tag.yml     |  2 ++
 Containerfile                        |  4 ++--
 4 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 .gitea/workflows/deploy.yml

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
deleted file mode 100644
index a00c10e..0000000
--- a/.gitea/workflows/deploy.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Deploy
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_COMPOSE: IMAGE_TAG=${{ gitea.ref_name }} docker compose --ansi=never -f=compose.yaml -f=compose.prod.yaml
-    steps:
diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml
index 9a36613..f2393e2 100644
--- a/.gitea/workflows/release-nightly.yml
+++ b/.gitea/workflows/release-nightly.yml
@@ -47,3 +47,5 @@ jobs:
           push: true
           tags: |
             gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+          cache-from: type=registry,ref=gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:buildcache
+          cache-to: type=registry,ref=gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:buildcache,mode=max
diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml
index 570c1a1..7d13cab 100644
--- a/.gitea/workflows/release-tag.yml
+++ b/.gitea/workflows/release-tag.yml
@@ -50,6 +50,8 @@ jobs:
           tags: |
             gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
             gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
+          cache-from: type=registry,ref=gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:buildcache
+          cache-to: type=registry,ref=gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:buildcache,mode=max
 
       - name: Deploy Image to Sever
         id: deploy
diff --git a/Containerfile b/Containerfile
index c9e55c7..928ba5b 100644
--- a/Containerfile
+++ b/Containerfile
@@ -13,8 +13,8 @@ FROM base as prod
 ADD requirements.txt ./
 
 RUN apt-get update && apt-get install -y build-essential \
-    && pip install --upgrade pip \
-    && pip3 install -r requirements.txt \
+    && pip3 install --no-cache --upgrade pip \
+    && pip3 install --no-cache -r requirements.txt \
     && apt-get remove -y build-essential
 
 ADD projectorpi_web/* ./
-- 
2.49.1