From a55ccdbfca3ba020e315b7236d0e2323ab3b2f4b Mon Sep 17 00:00:00 2001 From: Yury V Date: Sun, 15 Jan 2023 23:15:18 +0200 Subject: [PATCH] disabled armv6 and updated actions and golang (#201) Co-authored-by: Yury Vaskaboinikau --- .github/workflows/github-actions-docker.yml | 14 +++++++------- Dockerfile | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/github-actions-docker.yml b/.github/workflows/github-actions-docker.yml index c187530..a6c82e0 100644 --- a/.github/workflows/github-actions-docker.yml +++ b/.github/workflows/github-actions-docker.yml @@ -13,16 +13,16 @@ jobs: run : echo ${{ github.event.release.tag_name }} - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3.3.0 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v2.1.0 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2.2.1 - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2.1.0 with: registry: ghcr.io username: ${{ github.actor }} @@ -39,11 +39,11 @@ jobs: echo ${{ env.REG_REPO }} - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v3.3.0 with: context: . - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 + platforms: linux/amd64,linux/arm/v7,linux/arm64 push: true tags: | ghcr.io/${{ env.REG_REPO }}:${{ github.event.release.tag_name }} - ghcr.io/${{ env.REG_REPO }}:latest + ghcr.io/${{ env.REG_REPO }}:latest \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index deeef2c..df3951b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,9 @@ WORKDIR /app RUN yarn install && yarn run build ### FRONT BUILD END ### + ### BUILD TORRSERVER MULTIARCH START ### -FROM --platform=$BUILDPLATFORM golang:1.18-alpine as builder +FROM --platform=$BUILDPLATFORM golang:1.19-alpine as builder COPY . /opt/src COPY --from=front /app/build /opt/src/web/build @@ -42,6 +43,7 @@ RUN apt-get update && apt-get install -y upx-ucl && upx --best --lzma ./torrserv # && if [[ "$compress" -eq 1 ]]; then ./upx --best --lzma ./torrserver; fi ### UPX COMPRESSING END ### + ### BUILD MAIN IMAGE START ### FROM alpine