diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0a5c5359..9e44519a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,27 +20,27 @@ jobs: id: buildx uses: docker/setup-buildx-action@v1 - - name: Setup connection to arm64-capable runner - run: | - echo "::group::ssh-agent: launch and export" - eval "$(ssh-agent)" - echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV - echo "SSH_AGENT_PID=$SSH_AGENT_PID" >> $GITHUB_ENV - echo "::endgroup::" + # - name: Setup connection to arm64-capable runner + # run: | + # echo "::group::ssh-agent: launch and export" + # eval "$(ssh-agent)" + # echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> $GITHUB_ENV + # echo "SSH_AGENT_PID=$SSH_AGENT_PID" >> $GITHUB_ENV + # echo "::endgroup::" - echo "::group::ssh-agent: load private key" - ssh-add - <<< "${{ secrets.ARMRUNNER1_SSH_PRIVATE_KEY }}" - echo "::endgroup::" + # echo "::group::ssh-agent: load private key" + # ssh-add - <<< "${{ secrets.ARMRUNNER1_SSH_PRIVATE_KEY }}" + # echo "::endgroup::" - echo "::group::ssh: pin runner public key" - mkdir ~/.ssh && chmod 0700 ~/.ssh || : - echo "[${{ secrets.ARMRUNNER1_HOSTNAME }}]:${{ secrets.ARMRUNNER1_SSH_PORT }} ${{ secrets.ARMRUNNER1_SSH_HOSTKEY }}" > ~/.ssh/known_hosts - echo "::endgroup::" + # echo "::group::ssh: pin runner public key" + # mkdir ~/.ssh && chmod 0700 ~/.ssh || : + # echo "[${{ secrets.ARMRUNNER1_HOSTNAME }}]:${{ secrets.ARMRUNNER1_SSH_PORT }} ${{ secrets.ARMRUNNER1_SSH_HOSTKEY }}" > ~/.ssh/known_hosts + # echo "::endgroup::" - - name: Register arm64-capable runner with Buildx - env: - DOCKER_HOST: ssh://github-actions@${{ secrets.ARMRUNNER1_HOSTNAME }}:${{ secrets.ARMRUNNER1_SSH_PORT }} - run: docker buildx create --append --name ${{ steps.buildx.outputs.name }} --bootstrap + # - name: Register arm64-capable runner with Buildx + # env: + # DOCKER_HOST: ssh://github-actions@${{ secrets.ARMRUNNER1_HOSTNAME }}:${{ secrets.ARMRUNNER1_SSH_PORT }} + # run: docker buildx create --append --name ${{ steps.buildx.outputs.name }} --bootstrap - name: Checkout uses: actions/checkout@v2 @@ -84,7 +84,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm64,linux/arm/v7 + platforms: linux/amd64 # ,linux/arm64,linux/arm/v7 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }}