From d218027e0c2b1db40411a544c6b36c4c408ed366 Mon Sep 17 00:00:00 2001
From: Michael Balsillie <michael@balsillie.net>
Date: Sun, 21 Aug 2022 23:50:27 +1200
Subject: [PATCH] anchoring

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

diff --git a/.woodpecker/main.yml b/.woodpecker/main.yml
index 851e20c..8f41e07 100644
--- a/.woodpecker/main.yml
+++ b/.woodpecker/main.yml
@@ -1,13 +1,14 @@
 variables:
   &vars
-    - REGISTRY=code.balsillie.net
-    - REGISTRY_USER=michael
-    - ORGANIZATION=containers
-    - SOURCE_ORGANIZATION=mirrors
-    - REPO=matrix-service-synapse
-    - BUILD_ARGS="PYTHON_VERSION=3.10"
-    - DOCKERFILE="docker/Dockerfile"
-    - CONTEXT=.
+    environment:
+      - REGISTRY=code.balsillie.net
+      - REGISTRY_USER=michael
+      - ORGANIZATION=containers
+      - SOURCE_ORGANIZATION=mirrors
+      - REPO=matrix-service-synapse
+      - BUILD_ARGS="PYTHON_VERSION=3.10"
+      - DOCKERFILE="docker/Dockerfile"
+      - CONTEXT=.
 
 workspace:
   base: /git
@@ -28,7 +29,7 @@ pipeline:
   clone-source:
     image: docker:git
     environment:
-      *vars
+      <<: *vars
     commands:
       - git clone https://${REGISTRY}/${SOURCE_ORGANIZATION}/${REPO}.git /git/${REPO}
       - cd /git/${REPO}
@@ -42,7 +43,7 @@ pipeline:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      *vars
+      <<: *vars
     commands:
       - export DOCKER_BUILDKIT=1
       - cd /git/${REPO}