From 071f0af975d58814bc6d000b99a3eecc6c77ad07 Mon Sep 17 00:00:00 2001 From: GilbN Date: Sat, 2 Apr 2022 18:40:11 +0200 Subject: [PATCH] test --- .github/workflows/docker-build.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 8a6875a6..a26ddc6d 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -74,7 +74,7 @@ jobs: context: . platforms: linux/amd64,linux/arm/v7,linux/arm64 push: ${{ github.event_name != 'pull_request' }} - tags: latest + tags: latest, ${{ steps.get_version.outputs.VERSION }} labels: ${{ steps.metadata.outputs.labels }} build-args: TP_RELEASE=${{ steps.get_version.outputs.VERSION }},BUILD_DATE=${{ steps.date_time.outputs.NOW }} @@ -105,7 +105,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm/v7,linux/arm64 + platforms: amd64,arm32v7,arm64v8 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.metadata.outputs.tags }} labels: ${{ steps.metadata.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index b1f977e7..a1434412 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM} ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:${BUILDPLATFORM}-3.14 # set version label ARG BUILD_DATE