More tweaks to pipeline and some script tweaks

.woodpecker/deploy.yaml

@@ -28,9 +28,9 @@ steps:
           - 'echo "App version: $APP_VERSION"'
           - |
               docker build \
-                --tag "${REGISTRY_REPO}:${CI_COMMIT_SHA}" \
-                --tag "${REGISTRY_REPO}:latest" \
-                --tag "${REGISTRY_REPO}:${APP_VERSION}" \
+                --tag "$REGISTRY_REPO:$CI_COMMIT_SHA" \
+                --tag "$REGISTRY_REPO:latest" \
+                --tag "$REGISTRY_REPO:$APP_VERSION" \
                 --label "git.commit=${CI_COMMIT_SHA}" \
                 --label "git.branch=${CI_COMMIT_BRANCH}" \
                 .
@@ -96,9 +96,9 @@ steps:
               echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_URL" \
                 -u "$REGISTRY_USERNAME" \
                 --password-stdin
-          - 'docker push $REGISTRY_REPO:${CI_COMMIT_SHA}'
+          - 'docker push $REGISTRY_REPO:$CI_COMMIT_SHA'
           - 'docker push $REGISTRY_REPO:latest'
-          - 'docker push $REGISTRY_REPO:${APP_VERSION}'
+          - 'docker push $REGISTRY_REPO:$APP_VERSION'
           - echo "✓ Images pushed successfully"
       depends_on:
           - 'Docker image build'