From 6287b9deaa2cd1dd1b4e2745fac1f30e91eac097 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 13:47:01 -0700 Subject: [PATCH 1/8] Update docker-common.yml --- .github/workflows/docker-common.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-common.yml b/.github/workflows/docker-common.yml index aecd543db7..d059664fc6 100644 --- a/.github/workflows/docker-common.yml +++ b/.github/workflows/docker-common.yml @@ -48,11 +48,10 @@ jobs: BASE=${{ matrix.BASE }} context: install/docker/ file: install/docker/Dockerfile.${{ matrix.FLAVOR }} + platforms: linux/amd64,linux/armhf,linux/arm64 append: | - endpoint: ssh://192.168.2.124 platforms: linux/arm64 - - endpoint: unix:///var/run/docker.sock - platforms: linux/amd64,linux/armhf push: true tags: | koush/scrypted-common:${{ matrix.NODE_VERSION }}-${{ matrix.BASE }}-${{ matrix.FLAVOR }} From e7f16af04c607eb7b3ef708e72362275d18450fc Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 14:06:58 -0700 Subject: [PATCH 2/8] Update docker-common.yml --- .github/workflows/docker-common.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-common.yml b/.github/workflows/docker-common.yml index d059664fc6..ecc6352980 100644 --- a/.github/workflows/docker-common.yml +++ b/.github/workflows/docker-common.yml @@ -26,7 +26,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - + with: + platforms: linux/amd64,linux/armhf + append: | + - endpoint: ssh://192.168.2.124 + platforms: linux/arm64 + - name: Login to Docker Hub uses: docker/login-action@v1 with: From 5cf2b2663023f4c5abca53ad5481c64dc208ce12 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 14:07:37 -0700 Subject: [PATCH 3/8] Update docker-common.yml --- .github/workflows/docker-common.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker-common.yml b/.github/workflows/docker-common.yml index ecc6352980..372a0ae223 100644 --- a/.github/workflows/docker-common.yml +++ b/.github/workflows/docker-common.yml @@ -54,9 +54,6 @@ jobs: context: install/docker/ file: install/docker/Dockerfile.${{ matrix.FLAVOR }} platforms: linux/amd64,linux/armhf,linux/arm64 - append: | - - endpoint: ssh://192.168.2.124 - platforms: linux/arm64 push: true tags: | koush/scrypted-common:${{ matrix.NODE_VERSION }}-${{ matrix.BASE }}-${{ matrix.FLAVOR }} From 6cb4f589c04856aa918220242a7dccd0e9f0c7bc Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 14:10:01 -0700 Subject: [PATCH 4/8] Update docker-common.yml --- .github/workflows/docker-common.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-common.yml b/.github/workflows/docker-common.yml index 372a0ae223..1454d5be10 100644 --- a/.github/workflows/docker-common.yml +++ b/.github/workflows/docker-common.yml @@ -19,13 +19,13 @@ 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 Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 with: platforms: linux/amd64,linux/armhf append: | @@ -33,13 +33,13 @@ jobs: 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 }} From d2b1f104ca4fcaa111926e651f991f34a7e84012 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 14:17:10 -0700 Subject: [PATCH 5/8] Update docker-common.yml --- .github/workflows/docker-common.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/docker-common.yml b/.github/workflows/docker-common.yml index 1454d5be10..0f1c62e4f0 100644 --- a/.github/workflows/docker-common.yml +++ b/.github/workflows/docker-common.yml @@ -24,6 +24,13 @@ 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 }} + private-key-name: koushik_macstudio + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 with: From 40738a74cf17c02c91e13d9a706998577088596c Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 14:23:39 -0700 Subject: [PATCH 6/8] Update docker-common.yml --- .github/workflows/docker-common.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-common.yml b/.github/workflows/docker-common.yml index 0f1c62e4f0..037d1a232a 100644 --- a/.github/workflows/docker-common.yml +++ b/.github/workflows/docker-common.yml @@ -29,7 +29,6 @@ jobs: with: host: 192.168.2.124 private-key: ${{ secrets.KOUSHIK_MACSTUDIO_SSH_PRIVATE_KEY }} - private-key-name: koushik_macstudio - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From b5cc138e2b1a90a19ca61a00f18889bd3cf72343 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 14:33:28 -0700 Subject: [PATCH 7/8] Update docker-common.yml --- .github/workflows/docker-common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-common.yml b/.github/workflows/docker-common.yml index 037d1a232a..5d6f3b5962 100644 --- a/.github/workflows/docker-common.yml +++ b/.github/workflows/docker-common.yml @@ -35,7 +35,7 @@ jobs: with: platforms: linux/amd64,linux/armhf append: | - - endpoint: ssh://192.168.2.124 + - endpoint: ssh://koush@192.168.2.124 platforms: linux/arm64 - name: Login to Docker Hub From f6baf99935acba9f06eca1c10304072cde743842 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Jun 2023 14:36:47 -0700 Subject: [PATCH 8/8] Update docker.yml --- .github/workflows/docker.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 79b3faba0a..8f3198325f 100644 --- a/.github/workflows/docker.yml +++ b/.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://koush@192.168.2.124 + platforms: linux/arm64 - name: Login to Docker Hub uses: docker/login-action@v2