From 8eee8b5e7105c6ca34f02aa1603a2f021b0df0b4 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:04:23 +0100
Subject: [PATCH 01/18] ci: meh

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 3ab778b..dbd5dbf 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -102,7 +102,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          context: .
+          context: ./Server/Dockerfile
           push: true
           tags: wonderking/continuity:latest,"wonderking/continuity:${{ github.ref_name }}"
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-- 
2.45.2


From a1e3580ca27d8039aa3466c60af858155643051e Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:06:26 +0100
Subject: [PATCH 02/18] ci: ffs

---
 .gitea/workflows/server.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index dbd5dbf..d5db4f5 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -102,9 +102,9 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          context: ./Server/Dockerfile
+          file: ./Server/Dockerfile
           push: true
-          tags: wonderking/continuity:latest,"wonderking/continuity:${{ github.ref_name }}"
+          tags: wonderking/continuity:latest,wonderking/continuity:${{ github.ref_name }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
   dependency-track-container:
     needs: build-push-server-container
-- 
2.45.2


From c9ef8f42c0a48e09c6ff2062c0337db4b52044e4 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:15:40 +0100
Subject: [PATCH 03/18] ci: maybe

---
 .gitea/workflows/server.yaml | 1 +
 Server/docker-compose.yml    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index d5db4f5..d30da1f 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -102,6 +102,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
+          context: .
           file: ./Server/Dockerfile
           push: true
           tags: wonderking/continuity:latest,wonderking/continuity:${{ github.ref_name }}
diff --git a/Server/docker-compose.yml b/Server/docker-compose.yml
index 5cbd3e9..0bc41ef 100644
--- a/Server/docker-compose.yml
+++ b/Server/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   server:
-    image: continuity-server:latest
+    image: server:latest
     environment:
       - ENVIRONMENT=Development
       - Testing:CreateAccountOnLogin=true
-- 
2.45.2


From 9dc98614c31bc70d935c527e28cacc139be23d2b Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:22:07 +0100
Subject: [PATCH 04/18] ci: maybe?

---
 .gitea/workflows/server.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index d30da1f..67ccfc9 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -20,7 +20,7 @@ jobs:
   sonarqube:
     needs: build-server
     runs-on: ubuntu-latest
-    if: gitea.ref == 'refs/heads/master'
+    if: github.ref_name == 'master'
     steps:
       - uses: actions/checkout@v3
       - name: Setup dotnet
@@ -103,7 +103,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Server/Dockerfile
+          file: Server/Dockerfile
           push: true
           tags: wonderking/continuity:latest,wonderking/continuity:${{ github.ref_name }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-- 
2.45.2


From cba3df78834148f14e634e5f28445a928569360b Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:26:11 +0100
Subject: [PATCH 05/18] ci: arm issue?

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 67ccfc9..1a395ac 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -106,7 +106,7 @@ jobs:
           file: Server/Dockerfile
           push: true
           tags: wonderking/continuity:latest,wonderking/continuity:${{ github.ref_name }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm
   dependency-track-container:
     needs: build-push-server-container
     runs-on: ubuntu-latest
-- 
2.45.2


From dc4270dc6ad8e365f3906172a605aba1b71d1891 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:28:07 +0100
Subject: [PATCH 06/18] ci: for now only amd64

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 1a395ac..bfef8bb 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -106,7 +106,7 @@ jobs:
           file: Server/Dockerfile
           push: true
           tags: wonderking/continuity:latest,wonderking/continuity:${{ github.ref_name }}
-          platforms: linux/amd64,linux/arm
+          platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
     runs-on: ubuntu-latest
-- 
2.45.2


From a2c84a2d4f83db1160146cd0719fc4fbd3a6e423 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:29:50 +0100
Subject: [PATCH 07/18] ci: flaky sonarqube behaviour?

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index bfef8bb..6d22f3d 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -20,7 +20,7 @@ jobs:
   sonarqube:
     needs: build-server
     runs-on: ubuntu-latest
-    if: github.ref_name == 'master'
+    if: ${{ github.ref_name }} == 'master'
     steps:
       - uses: actions/checkout@v3
       - name: Setup dotnet
-- 
2.45.2


From 54151c1f25c5edf60acb17691050348e982f1dd9 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:30:46 +0100
Subject: [PATCH 08/18] ci: rename tags

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 6d22f3d..652931c 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -105,7 +105,7 @@ jobs:
           context: .
           file: Server/Dockerfile
           push: true
-          tags: wonderking/continuity:latest,wonderking/continuity:${{ github.ref_name }}
+          tags: Wonderking/Continuity:latest,Wonderking/Continuity:${{ github.ref_name }}
           platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
-- 
2.45.2


From f0511cab6a395f5736cc7fa1175908b511959d64 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:37:08 +0100
Subject: [PATCH 09/18] revert: rename tags

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 652931c..6d22f3d 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -105,7 +105,7 @@ jobs:
           context: .
           file: Server/Dockerfile
           push: true
-          tags: Wonderking/Continuity:latest,Wonderking/Continuity:${{ github.ref_name }}
+          tags: wonderking/continuity:latest,wonderking/continuity:${{ github.ref_name }}
           platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
-- 
2.45.2


From 6c7da5ffd77f35a720abb86c8896477d7af921b1 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:47:26 +0100
Subject: [PATCH 10/18] ci: omg

---
 .gitea/workflows/server.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 6d22f3d..3f99871 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -102,6 +102,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
+          registry: forge.rainote.dev
           context: .
           file: Server/Dockerfile
           push: true
-- 
2.45.2


From 259d8e72a9ece7db8300d1399397b4bdc51e99b5 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:49:29 +0100
Subject: [PATCH 11/18] ci: push with full url

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 3f99871..e12c3e2 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -106,7 +106,7 @@ jobs:
           context: .
           file: Server/Dockerfile
           push: true
-          tags: wonderking/continuity:latest,wonderking/continuity:${{ github.ref_name }}
+          tags: forge.rainote.dev/wonderking/continuity:latest,forge.rainote.dev/wonderking/continuity:${{ github.ref_name }}
           platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
-- 
2.45.2


From 58e34b06ad0397b270b286d05c308eaaea245ab3 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:52:30 +0100
Subject: [PATCH 12/18] ci: does this help with mapping to project?

---
 .gitea/workflows/server.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index e12c3e2..1ca956a 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -102,11 +102,10 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          registry: forge.rainote.dev
           context: .
           file: Server/Dockerfile
           push: true
-          tags: forge.rainote.dev/wonderking/continuity:latest,forge.rainote.dev/wonderking/continuity:${{ github.ref_name }}
+          tags: forge.rainote.dev/Wonderking/Continuity:latest,forge.rainote.dev/Wonderking/Continuity:${{ github.ref_name }}
           platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
-- 
2.45.2


From 137bc0dac16bf61051a22ae663752135839a78cf Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:53:06 +0100
Subject: [PATCH 13/18] ci: add docker compatible container for dtrack
 container

---
 .gitea/workflows/server.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 1ca956a..cd91305 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -110,6 +110,7 @@ jobs:
   dependency-track-container:
     needs: build-push-server-container
     runs-on: ubuntu-latest
+    container: catthehacker/ubuntu:act-latest
     steps:
       - uses: actions/checkout@v3
       - name: Setup dotnet
-- 
2.45.2


From cb0732dd1c0c9e592ee432c324814307dcf46d59 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 14:55:37 +0100
Subject: [PATCH 14/18] ci: lets attempt dynamic registry url

---
 .gitea/workflows/server.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index cd91305..a31285f 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -96,7 +96,7 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          registry: forge.rainote.dev
+          registry: ${{ github.server_url }}
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
       - name: Build and push
@@ -105,7 +105,7 @@ jobs:
           context: .
           file: Server/Dockerfile
           push: true
-          tags: forge.rainote.dev/Wonderking/Continuity:latest,forge.rainote.dev/Wonderking/Continuity:${{ github.ref_name }}
+          tags: ${{ github.server_url }}/${{ github.repository }}:latest,${{ github.server_url }}/${{ github.repository }}:${{ github.ref_name }}
           platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
-- 
2.45.2


From cc98e1f96024b798501b62531ac211696adfee61 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 15:03:09 +0100
Subject: [PATCH 15/18] ci: I guess

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index a31285f..08900af 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -105,7 +105,7 @@ jobs:
           context: .
           file: Server/Dockerfile
           push: true
-          tags: ${{ github.server_url }}/${{ github.repository }}:latest,${{ github.server_url }}/${{ github.repository }}:${{ github.ref_name }}
+          tags: forge.rainote.dev/${{ github.repository }}:latest,${{ github.server_url }}/${{ github.repository }}:${{ github.ref_name }}
           platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
-- 
2.45.2


From 6d991d88cff7447664d2cfe1a9149d4b4571a6dd Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 15:05:37 +0100
Subject: [PATCH 16/18] ci: aaaaaaaaaaa

---
 .gitea/workflows/server.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 08900af..4084989 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -105,7 +105,7 @@ jobs:
           context: .
           file: Server/Dockerfile
           push: true
-          tags: forge.rainote.dev/${{ github.repository }}:latest,${{ github.server_url }}/${{ github.repository }}:${{ github.ref_name }}
+          tags: forge.rainote.dev/${{ github.repository }}:latest,forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }}
           platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
-- 
2.45.2


From dad5e99f0fb5956452fa43a6f1f6f572fd3c189f Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 15:13:18 +0100
Subject: [PATCH 17/18] ci: adjustments

---
 .gitea/workflows/server.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 4084989..329400a 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -20,7 +20,7 @@ jobs:
   sonarqube:
     needs: build-server
     runs-on: ubuntu-latest
-    if: ${{ github.ref_name }} == 'master'
+    if: github.ref_name == 'master'
     steps:
       - uses: actions/checkout@v3
       - name: Setup dotnet
@@ -105,7 +105,7 @@ jobs:
           context: .
           file: Server/Dockerfile
           push: true
-          tags: forge.rainote.dev/${{ github.repository }}:latest,forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }}
+          tags: forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }}
           platforms: linux/amd64
   dependency-track-container:
     needs: build-push-server-container
@@ -127,7 +127,7 @@ jobs:
           curl -sSfL https://raw.githubusercontent.com/docker/sbom-cli-plugin/main/install.sh | sh -s --
       - name: Generate SBOM
         run: |
-          docker sbom --format cyclonedx-json --output bom.json forge.rainote.dev/Wonderking/Continuity:latest
+          docker sbom forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }} --format cyclonedx-json --output bom.json
       - name: Upload SBOM
         uses: https://github.com/DependencyTrack/gh-upload-sbom@v2.0.1
         with:
-- 
2.45.2


From 825aad780252e67a735fe45d5763585fe8692fa1 Mon Sep 17 00:00:00 2001
From: Timothy Schenk <admin@rainote.dev>
Date: Fri, 3 Nov 2023 15:16:03 +0100
Subject: [PATCH 18/18] ci: login registry

---
 .gitea/workflows/server.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitea/workflows/server.yaml b/.gitea/workflows/server.yaml
index 329400a..c7346db 100644
--- a/.gitea/workflows/server.yaml
+++ b/.gitea/workflows/server.yaml
@@ -125,6 +125,12 @@ jobs:
         run: |
           mkdir ~/.docker
           curl -sSfL https://raw.githubusercontent.com/docker/sbom-cli-plugin/main/install.sh | sh -s --
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ github.server_url }}
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
       - name: Generate SBOM
         run: |
           docker sbom forge.rainote.dev/${{ github.repository }}:${{ github.ref_name }} --format cyclonedx-json --output bom.json
-- 
2.45.2