From 0d12590ad02de4f8dae136a7596f213806e43e07 Mon Sep 17 00:00:00 2001
From: Michael Balsillie <michael@balsillie.net>
Date: Sun, 21 Aug 2022 23:55:55 +1200
Subject: [PATCH] mucking with expansions

---
 .woodpecker/main.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.woodpecker/main.yml b/.woodpecker/main.yml
index 931fde8..4a7e416 100644
--- a/.woodpecker/main.yml
+++ b/.woodpecker/main.yml
@@ -21,8 +21,8 @@ pipeline:
       - SOURCE_ORGANIZATION=mirrors
       - REPO=matrix-service-synapse
     commands:
-      - git clone https://${REGISTRY}/${SOURCE_ORGANIZATION}/${REPO}.git /git/${REPO}
-      - cd /git/${REPO}
+      - git clone https://$${REGISTRY}/$${SOURCE_ORGANIZATION}/$${REPO}.git /git/$${REPO}
+      - cd /git/$${REPO}
       - git checkout $TAG
 
   docker-build:
@@ -42,14 +42,14 @@ pipeline:
       - CONTEXT=.
     commands:
       - export DOCKER_BUILDKIT=1
-      - cd /git/${REPO}
-      - echo $REGISTRY_PASSWORD | docker login ${REGISTRY} -u ${REGISTRY_USER} --password-stdin
+      - cd /git/$${REPO}
+      - echo $REGISTRY_PASSWORD | docker login $${REGISTRY} -u $${REGISTRY_USER} --password-stdin
       - docker build
-        -t ${REGISTRY}/${ORGANIZATION}/${REPO}:$TAG
-        -t ${REGISTRY}/${ORGANIZATION}/${REPO}:$(date +%F)
-        -t ${REGISTRY}/${ORGANIZATION}/${REPO}:latest
+        -t $${REGISTRY}/$${ORGANIZATION}/$${REPO}:$TAG
+        -t $${REGISTRY}/$${ORGANIZATION}/$${REPO}:$(date +%F)
+        -t $${REGISTRY}/$${ORGANIZATION}/$${REPO}:latest
         --pull
-        --build-arg ${BUILD_ARGS}
-        -f ${DOCKERFILE}
-        ${CONTEXT}
-      - docker push -a ${REGISTRY}/${ORGANIZATION}/${REPO}
\ No newline at end of file
+        --build-arg $${BUILD_ARGS}
+        -f $${DOCKERFILE}
+        $${CONTEXT}
+      - docker push -a $${REGISTRY}/$${ORGANIZATION}/$${REPO}
\ No newline at end of file