From f904c59532615be86448e15b482dfa6f1c0e5682 Mon Sep 17 00:00:00 2001 From: kermieisinthehouse Date: Sun, 24 Oct 2021 23:36:36 +0000 Subject: [PATCH] Fix docker (#1883) --- docker/ci/x86_64/Dockerfile | 2 +- docker/ci/x86_64/docker_push.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/ci/x86_64/Dockerfile b/docker/ci/x86_64/Dockerfile index 376e74da9..33cf4e269 100644 --- a/docker/ci/x86_64/Dockerfile +++ b/docker/ci/x86_64/Dockerfile @@ -9,7 +9,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ]; then BIN=stash-pi; \ fi; \ mv $BIN /stash -FROM --platform=$BUILDPLATFORM alpine:latest AS app +FROM --platform=$TARGETPLATFORM alpine:latest AS app COPY --from=binary /stash /usr/bin/ RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg vips-tools && pip install mechanicalsoup cloudscraper ENV STASH_CONFIG_FILE=/root/.stash/config.yml diff --git a/docker/ci/x86_64/docker_push.sh b/docker/ci/x86_64/docker_push.sh index 8d638e0f7..7ca5ff201 100644 --- a/docker/ci/x86_64/docker_push.sh +++ b/docker/ci/x86_64/docker_push.sh @@ -10,5 +10,5 @@ done echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin # must build the image from dist directory -docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push $DOCKER_TAGS -f docker/ci/x86_64/Dockerfile dist/ +docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 --push $DOCKER_TAGS -f docker/ci/x86_64/Dockerfile dist/