Merge pull request #949 from DefGuard/dev

Merge dev -> main
DefGuard · Jan 16, 2025 · 4016c90 · 4016c90
2 parents 184ee51 + 8162e8d
commit 4016c90
Show file tree

Hide file tree

Showing 395 changed files with 16,238 additions and 12,891 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -23,17 +23,18 @@ jobs:
       - ${{ matrix.runner }}
     strategy:
       matrix:
-        cpu: [arm64, amd64, arm/v7]
+        # cpu: [arm64, amd64, arm/v7]
+        cpu: [arm64, amd64]
         include:
           - cpu: arm64
             runner: ARM64
             tag: arm64
           - cpu: amd64
             runner: X64
             tag: amd64
-          - cpu: arm/v7
-            runner: ARM
-            tag: armv7
+          # - cpu: arm/v7
+          #   runner: ARM
+          #   tag: armv7
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -86,6 +87,7 @@ jobs:
           for tag in ${tags}
           do
             docker manifest rm ${tag} || true
-            docker manifest create ${tag} ${{ env.GHCR_REPO }}:${{ github.sha }}-amd64 ${{ env.GHCR_REPO }}:${{ github.sha }}-arm64 ${{ env.GHCR_REPO }}:${{ github.sha }}-armv7
+            docker manifest create ${tag} ${{ env.GHCR_REPO }}:${{ github.sha }}-amd64 ${{ env.GHCR_REPO }}:${{ github.sha }}-arm64
             docker manifest push ${tag}
           done
+        #  ${{ env.GHCR_REPO }}:${{ github.sha }}-armv7
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Stop compose
         if: always()
         run: docker compose --file './docker-compose.e2e.yaml' down
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: playwright-report

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 target/
 defguard.db*
 .volumes*
-node_modules
+node_modules/
 .DS_Store
 dist
 dist-ssr
@@ -13,3 +13,4 @@ ladle-build
 .envrc
 .direnv/
 *.pem
+result/
diff --git a/.sqlx/query-035360e0dd260aece5c89979b28e87a85eb04e2b0eec2d9bc63e8fee6abda27e.json b/.sqlx/query-035360e0dd260aece5c89979b28e87a85eb04e2b0eec2d9bc63e8fee6abda27e.json
diff --git a/.sqlx/query-06d1ac982dc99c5dae010089cfb73a044397c5cb6bb9654dc5df420bf00d2955.json b/.sqlx/query-06d1ac982dc99c5dae010089cfb73a044397c5cb6bb9654dc5df420bf00d2955.json
diff --git a/.sqlx/query-08a62bb8185b4be5ba5eedf4aec02985e2e2f4dfea711698bfc191114e47857f.json b/.sqlx/query-08a62bb8185b4be5ba5eedf4aec02985e2e2f4dfea711698bfc191114e47857f.json
diff --git a/.sqlx/query-0a6eedbe05b3b456c68e40403565fb2749f754ee640c8dbe3227169a4e341406.json b/.sqlx/query-0a6eedbe05b3b456c68e40403565fb2749f754ee640c8dbe3227169a4e341406.json
diff --git a/.sqlx/query-0e9a8c2395d43898748c176db0d89fa20784cd93ca1dfd00b2755934937d8270.json b/.sqlx/query-0e9a8c2395d43898748c176db0d89fa20784cd93ca1dfd00b2755934937d8270.json
diff --git a/...4e1be4cddff56ad50f27b2e3d0f42188a6cd.json → ...be0fe17c2ee3722f907251abfd6e5fe5d997.json b/...4e1be4cddff56ad50f27b2e3d0f42188a6cd.json → ...be0fe17c2ee3722f907251abfd6e5fe5d997.json
diff --git a/.sqlx/query-169a39acbf7e6b74fd9f538047b0af650fe1bfa21d844a216e80965011290412.json b/.sqlx/query-169a39acbf7e6b74fd9f538047b0af650fe1bfa21d844a216e80965011290412.json
diff --git a/.sqlx/query-1aab945b0f7df1c079ae359b17b0629e7c30d4c7e6605157f8cb2bb1cfec322a.json b/.sqlx/query-1aab945b0f7df1c079ae359b17b0629e7c30d4c7e6605157f8cb2bb1cfec322a.json
diff --git a/.sqlx/query-1b1f0a82cbbf2abbafb7cae6718fb50c0a8294bce9757431ca3a6a0505f39df3.json b/.sqlx/query-1b1f0a82cbbf2abbafb7cae6718fb50c0a8294bce9757431ca3a6a0505f39df3.json
diff --git a/.sqlx/query-1c220b1ba44ec49ad6423e97635995ecb9c0fcb8762c25aa960e7b5a2e49963b.json b/.sqlx/query-1c220b1ba44ec49ad6423e97635995ecb9c0fcb8762c25aa960e7b5a2e49963b.json
diff --git a/.sqlx/query-1cad18ee4393faed671f07a2f0faeff413376b8c4760ef86f5de6a7e74b7c858.json b/.sqlx/query-1cad18ee4393faed671f07a2f0faeff413376b8c4760ef86f5de6a7e74b7c858.json