From 0419e8ad662e998f59e55640dddcdfeca568b102 Mon Sep 17 00:00:00 2001
From: Kouhai <devkouhai@gmail.com>
Date: Mon, 24 Apr 2023 02:22:10 -0700
Subject: [PATCH] th: cache busting? not on our watch

---
 .woodpecker.yml | 8 ++++++--
 Dockerfile      | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 0dde1e7ab4..247a198144 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,11 +1,13 @@
 variables:
+  environment: &docker-environment
+    NAME: gitea.treehouse.systems/treehouse/mastodon
+    DATE_COMMAND: export COMMIT_DATE=$(date -u -Idate -d @$(git show -s --format=%ct))
   docker-step: &docker-step
     image: docker:rc-git
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      NAME: gitea.treehouse.systems/treehouse/mastodon
-      DATE_COMMAND: export COMMIT_DATE=$(date -u -Idate -d @$(git show -s --format=%ct))
+      <<: *docker-environment
 
 clone:
   git:
@@ -53,10 +55,12 @@ pipeline:
     <<: *docker-step
     commands:
       - echo $REGISTRY_SECRET | docker login -u $REGISTRY_USER --password-stdin gitea.treehouse.systems
+      - cat tags.txt | xargs -n 1 -I% echo docker image push $NAME:%
       - cat tags.txt | xargs -n 1 -I% docker image push $NAME:%
     when:
       event: [push, tag]
       branch: main
     secrets: [REGISTRY_SECRET]
     environment:
+      <<: *docker-environment
       REGISTRY_USER: ariadne
diff --git a/Dockerfile b/Dockerfile
index 136df8ba27..056dffd6e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,7 +64,6 @@ RUN mv ./emoji_data/all.json ./node_modules/emoji-mart/data/all.json && \
 
 FROM node:${NODE_VERSION}
 
-ARG SOURCE_TAG=''
 ARG UID="991"
 ARG GID="991"
 
@@ -104,6 +103,7 @@ RUN apt-get update && \
 
 COPY --link --chown=mastodon:mastodon --from=build /opt/mastodon /opt/mastodon
 
+ARG SOURCE_TAG=''
 ENV RAILS_ENV="production" \
     NODE_ENV="production" \
     RAILS_SERVE_STATIC_FILES="true" \