Merge branch 'main' of github.com:koush/scrypted

.github/workflows/docker-common.yml

@@ -19,22 +19,33 @@ jobs:
         FLAVOR: ["full", "lite", "thin"]
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up SSH
+        uses: MrSquaare/ssh-setup-action@v2
+        with:
+          host: 192.168.2.124
+          private-key: ${{ secrets.KOUSHIK_MACSTUDIO_SSH_PRIVATE_KEY }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
+        uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/amd64,linux/armhf
+          append: |
+            - endpoint: ssh://[email protected]
+              platforms: linux/arm64
+
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to Github Container Registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -48,11 +59,7 @@ jobs:
             BASE=${{ matrix.BASE }}
           context: install/docker/
           file: install/docker/Dockerfile.${{ matrix.FLAVOR }}
-          append: |
-            - endpoint: ssh://192.168.2.124
-              platforms: linux/arm64
-            - endpoint: unix:///var/run/docker.sock
-              platforms: linux/amd64,linux/armhf
+          platforms: linux/amd64,linux/armhf,linux/arm64
           push: true
           tags: |
             koush/scrypted-common:${{ matrix.NODE_VERSION }}-${{ matrix.BASE }}-${{ matrix.FLAVOR }}

.github/workflows/docker.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   build:
     name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     strategy:
       matrix:
         BASE: ["18-jammy-full", "18-jammy-lite", "18-jammy-thin"]
@@ -38,8 +38,19 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
+      - name: Set up SSH
+        uses: MrSquaare/ssh-setup-action@v2
+        with:
+          host: 192.168.2.124
+          private-key: ${{ secrets.KOUSHIK_MACSTUDIO_SSH_PRIVATE_KEY }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/amd64,linux/armhf
+          append: |
+            - endpoint: ssh://[email protected]
+              platforms: linux/arm64
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2