Merge develop

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
hcengineering · Aug 6, 2024 · 986fc51 · 986fc51
2 parents ea081ee + 5450a07
commit 986fc51
Show file tree

Hide file tree

Showing 378 changed files with 6,115 additions and 2,614 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -460,6 +460,17 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Configure docker
+        uses: crazy-max/ghaction-setup-docker@v3
+        with:
+          daemon-config: |
+            {
+              "features": {
+                "containerd-snapshotter": true
+              }
+            }
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -488,6 +499,7 @@ jobs:
         run: node common/scripts/install-run-rush.js docker:build -v
         env:
           DOCKER_CLI_HINTS: false
+          DOCKER_EXTRA: --platform=linux/amd64,linux/arm64
       - name: Login to Docker Hub
         if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
         uses: docker/login-action@v3

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -41,6 +41,7 @@
         "METRICS_FILE": "${workspaceRoot}/metrics.txt", // Show metrics in console evert 30 seconds.,
         "STORAGE_CONFIG": "minio|localhost?accessKey=minioadmin&secretKey=minioadmin",
         "SERVER_SECRET": "secret",
+        "ENABLE_CONSOLE": "true",
         "COLLABORATOR_URL": "ws://localhost:3078",
         "COLLABORATOR_API_URL": "http://localhost:3078",
         "REKONI_URL": "http://localhost:4004",
@@ -100,6 +101,7 @@
         "ACCOUNTS_URL": "http://localhost:3000",
         "UPLOAD_URL": "/files",
         "SERVER_PORT": "8087",
+        "VERSION": null,
         "COLLABORATOR_URL": "ws://localhost:3078",
         "COLLABORATOR_API_URL": "http://localhost:3078",
         "CALENDAR_URL": "http://localhost:8095",