From a5c45fa6901fd8203ce923abf1dca3617906f45c Mon Sep 17 00:00:00 2001 From: Michael Balsillie Date: Sun, 21 Aug 2022 23:33:27 +1200 Subject: [PATCH] newline stuff --- .woodpecker/main.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.woodpecker/main.yml b/.woodpecker/main.yml index 809eed4..29e70ed 100644 --- a/.woodpecker/main.yml +++ b/.woodpecker/main.yml @@ -1,12 +1,12 @@ 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" && + 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: @@ -40,12 +40,12 @@ pipeline: - export DOCKER_BUILDKIT=1 - 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 \ - --pull \ - --build-arg $BUILD_ARGS \ - -f $DOCKERFILE \ + - docker build + -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 $REGISTRY/$ORGANIZATION/$REPO:latest \ No newline at end of file