From a2c2e39a1b8e165c153131ed7376051067d23089 Mon Sep 17 00:00:00 2001 From: Marcin-Ramotowski Date: Tue, 22 Jul 2025 19:30:03 +0200 Subject: [PATCH] Corrected commands variables expansion --- .woodpecker/build.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index c6c3eff..8da2262 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -17,12 +17,12 @@ steps: environment: ACR_NAME: marcin00 CLIENT_ID: c302726f-fafb-4143-94c1-67a70975574a - DOCKER_IMAGE: marcin00.azurecr.io/user-microservice:${CI_COMMIT_SHA} commands: - - docker build -t ${DOCKER_IMAGE} --build-arg APP_VERSION=${CI_COMMIT_SHA} --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") . - - az login --identity --client-id ${CLIENT_ID} - - az acr login --name ${ACR_NAME} - - docker push ${DOCKER_IMAGE} + - export DOCKER_IMAGE=marcin00.azurecr.io/user-microservice:${CI_COMMIT_SHA} + - docker build -t $DOCKER_IMAGE --build-arg APP_VERSION=${CI_COMMIT_SHA} --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") . + - az login --identity --client-id $CLIENT_ID + - az acr login --name $ACR_NAME + - docker push $DOCKER_IMAGE backend_options: kubernetes: annotations: @@ -40,16 +40,16 @@ steps: commands: - mkdir -p ~/.ssh - - echo "${GITEA_KNOWN_HOST}" >> ~/.ssh/known_hosts + - echo "$GITEA_KNOWN_HOST" >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - - echo "${GITEA_DEPLOY_KEY}" > ~/.ssh/id_rsa + - echo "$GITEA_DEPLOY_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - git config --global user.name "woodpecker[bot]" - git config --global user.email "woodpecker@marcin00.pl" - - git clone "${DEPLOY_REPO}" --branch woodpecker-deploy + - git clone $DEPLOY_REPO --branch woodpecker-deploy - cd user-microservice-deploy - |