From 59014f14cada3c41d3b3b85e5563e58fcc4a1499 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Fri, 28 Feb 2025 17:56:32 +1100
Subject: [PATCH] =?UTF-8?q?Revert=20"Add=20docker=20labels=20to=20have=20u?=
 =?UTF-8?q?pdate=20tools=20be=20able=20to=20pull=20changelog/rele=E2=80=A6?=
 =?UTF-8?q?"=20(#5688)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 661e9eba5170195d20009888bca7fa5180e7d88d.
---
 .github/workflows/build.yml         |  4 ++--
 docker/build/x86_64/Dockerfile      |  2 --
 docker/build/x86_64/Dockerfile-CUDA |  2 --
 docker/ci/x86_64/Dockerfile         |  2 --
 docker/ci/x86_64/docker_push.sh     | 11 +----------
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 962fd82a4..8b6627395 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -199,7 +199,7 @@ jobs:
         docker buildx create --name builder --use
         docker buildx inspect --bootstrap
         docker buildx ls
-        bash ./docker/ci/x86_64/docker_push.sh "${{ env.STASH_VERSION }}" development
+        bash ./docker/ci/x86_64/docker_push.sh development
 
     - name: Release Docker
       # NOTE: this isn't perfect, but should cover most scenarios
@@ -215,4 +215,4 @@ jobs:
         docker buildx create --name builder --use
         docker buildx inspect --bootstrap
         docker buildx ls
-        bash ./docker/ci/x86_64/docker_push.sh "${{ env.STASH_VERSION }}" latest "${{ github.event.release.tag_name }}"
+        bash ./docker/ci/x86_64/docker_push.sh latest "${{ github.event.release.tag_name }}"
diff --git a/docker/build/x86_64/Dockerfile b/docker/build/x86_64/Dockerfile
index d1b7cb6c0..b945c9c4a 100644
--- a/docker/build/x86_64/Dockerfile
+++ b/docker/build/x86_64/Dockerfile
@@ -32,8 +32,6 @@ RUN make flags-release flags-pie stash
 
 # Final Runnable Image
 FROM alpine:latest
-ARG STASH_VERSION
-LABEL org.opencontainers.image.source="https://github.com/stashapp/stash/" org.opencontainers.image.revision=${STASH_VERSION}
 RUN apk add --no-cache ca-certificates vips-tools ffmpeg
 COPY --from=backend /stash/stash /usr/bin/
 ENV STASH_CONFIG_FILE=/root/.stash/config.yml
diff --git a/docker/build/x86_64/Dockerfile-CUDA b/docker/build/x86_64/Dockerfile-CUDA
index 445c48e22..f76c6dea6 100644
--- a/docker/build/x86_64/Dockerfile-CUDA
+++ b/docker/build/x86_64/Dockerfile-CUDA
@@ -32,8 +32,6 @@ RUN make flags-release flags-pie stash
 
 # Final Runnable Image
 FROM nvidia/cuda:12.0.1-base-ubuntu22.04
-ARG STASH_VERSION
-LABEL org.opencontainers.image.source="https://github.com/stashapp/stash/" org.opencontainers.image.revision=${STASH_VERSION}
 RUN apt update && apt upgrade -y && apt install -y ca-certificates libvips-tools ffmpeg wget intel-media-va-driver-non-free vainfo
 RUN rm -rf /var/lib/apt/lists/*
 COPY --from=backend /stash/stash /usr/bin/
diff --git a/docker/ci/x86_64/Dockerfile b/docker/ci/x86_64/Dockerfile
index e103de680..f0f1e242b 100644
--- a/docker/ci/x86_64/Dockerfile
+++ b/docker/ci/x86_64/Dockerfile
@@ -10,8 +10,6 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm/v6" ];   then BIN=stash-linux-arm32v6; \
     mv $BIN /stash
 
 FROM --platform=$TARGETPLATFORM alpine:latest AS app
-ARG STASH_VERSION
-LABEL org.opencontainers.image.source="https://github.com/stashapp/stash/" org.opencontainers.image.revision=${STASH_VERSION}
 COPY --from=binary /stash /usr/bin/
 
 RUN apk add --no-cache ca-certificates python3 py3-requests py3-requests-toolbelt py3-lxml py3-pip ffmpeg ruby tzdata vips vips-tools \
diff --git a/docker/ci/x86_64/docker_push.sh b/docker/ci/x86_64/docker_push.sh
index 53bdb4c90..7ca5ff201 100644
--- a/docker/ci/x86_64/docker_push.sh
+++ b/docker/ci/x86_64/docker_push.sh
@@ -2,10 +2,6 @@
 
 DOCKER_TAGS=""
 
-# usage: ./docker_push.sh <version> <tag1> <tag2> ...
-STASH_VERSION="$1"
-shift
-
 for TAG in "$@"
 do
 	DOCKER_TAGS="$DOCKER_TAGS -t stashapp/stash:$TAG"
@@ -14,10 +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,linux/arm/v6 \
-  --build-arg "STASH_VERSION=${STASH_VERSION}" \
-  --push "${DOCKER_TAGS}" \
-  --file 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/