From ccafe6d651c8b01f55177adc5ae0aabfa883ae45 Mon Sep 17 00:00:00 2001 From: lapi Date: Wed, 21 Oct 2020 01:56:33 +0900 Subject: [PATCH 1/3] feat: multi arch publish --- .github/workflows/build-tshock.yml | 21 +++++++++++++++------ .github/workflows/build-vanilla.yml | 21 +++++++++++++++------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-tshock.yml b/.github/workflows/build-tshock.yml index 136a2ca..1d47f55 100644 --- a/.github/workflows/build-tshock.yml +++ b/.github/workflows/build-tshock.yml @@ -13,12 +13,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Publish TShock - uses: elgohr/Publish-Docker-Github-Action@master + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 with: - name: ryshe/terraria username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: tshock/Dockerfile - tags: "tshock-latest" - tag_names: true \ No newline at end of file + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + file: tshock/Dockerfile + platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x + push: true + tags: | + ryshe/terraria:tshock-latest diff --git a/.github/workflows/build-vanilla.yml b/.github/workflows/build-vanilla.yml index 2e02e5f..43f0c0c 100644 --- a/.github/workflows/build-vanilla.yml +++ b/.github/workflows/build-vanilla.yml @@ -13,12 +13,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - - name: Publish TShock - uses: elgohr/Publish-Docker-Github-Action@master + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 with: - name: ryshe/terraria username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: vanilla/Dockerfile - tags: "vanilla-latest" - tag_names: true \ No newline at end of file + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + file: vanilla/Dockerfile + platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x + push: true + tags: | + ryshe/terraria:vanilla-latest From f01188c1f8b3977cffcc189edd29cf55a684ce76 Mon Sep 17 00:00:00 2001 From: lapi Date: Wed, 21 Oct 2020 02:07:38 +0900 Subject: [PATCH 2/3] fix: fix platforms --- .github/workflows/build-tshock.yml | 2 +- .github/workflows/build-vanilla.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-tshock.yml b/.github/workflows/build-tshock.yml index 1d47f55..95b160b 100644 --- a/.github/workflows/build-tshock.yml +++ b/.github/workflows/build-tshock.yml @@ -27,7 +27,7 @@ jobs: with: context: . file: tshock/Dockerfile - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x + platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le push: true tags: | ryshe/terraria:tshock-latest diff --git a/.github/workflows/build-vanilla.yml b/.github/workflows/build-vanilla.yml index 43f0c0c..2e18dee 100644 --- a/.github/workflows/build-vanilla.yml +++ b/.github/workflows/build-vanilla.yml @@ -27,7 +27,7 @@ jobs: with: context: . file: vanilla/Dockerfile - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x + platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le push: true tags: | ryshe/terraria:vanilla-latest From bc17437a02128db695ff102e9626d10c70b9c2fe Mon Sep 17 00:00:00 2001 From: lapi Date: Wed, 21 Oct 2020 02:14:09 +0900 Subject: [PATCH 3/3] fix: fix context --- .github/workflows/build-tshock.yml | 2 +- .github/workflows/build-vanilla.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-tshock.yml b/.github/workflows/build-tshock.yml index 95b160b..d2bb2a9 100644 --- a/.github/workflows/build-tshock.yml +++ b/.github/workflows/build-tshock.yml @@ -25,7 +25,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v2 with: - context: . + context: ./tshock file: tshock/Dockerfile platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le push: true diff --git a/.github/workflows/build-vanilla.yml b/.github/workflows/build-vanilla.yml index 2e18dee..2c82f60 100644 --- a/.github/workflows/build-vanilla.yml +++ b/.github/workflows/build-vanilla.yml @@ -25,7 +25,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v2 with: - context: . + context: ./vanilla file: vanilla/Dockerfile platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le push: true