fix ui pipelien

delivery.yaml

@@ -70,10 +70,15 @@ pipeline:
             IMAGE=${MULTI_ARCH_REGISTRY}/postgres-operator-ui-test
           fi
           
-            IMAGE_TAG=$(make docker-push IMAGE=${IMAGE} BASE_IMAGE=${PYTHON_BASE_IMAGE})
+          make appjs
+          docker buildx create --config /etc/cdp-buildkitd.toml --driver-opt network=host --bootstrap --use
+          docker buildx build --platform linux/amd64,linux/arm64 \
+                              --build-arg BASE_IMAGE="${PYTHON_BASE_IMAGE}" \
+                              -t ${IMAGE}:${CDP_BUILD_VERSION} \
+                              --push .
 
           if [ -z ${CDP_SOURCE_BRANCH} ]; then
-              cdp-promote-image ${IMAGE_TAG}
+            cdp-promote-image ${IMAGE}:${CDP_BUILD_VERSION}
           fi
 
   - id: build-logical-backup
@@ -96,3 +101,14 @@ pipeline:
           if [ -z ${CDP_SOURCE_BRANCH} ]; then
             cdp-promote-image ${MULTI_ARCH_REGISTRY}/postgres-operator-logical-backup:${TAG}
           fi
+
+  - id: tag-operator
+    type: script
+    requires_human_approval: true
+    when:
+      event: push
+      branch: master
+    commands:
+      - desc: Tag release operator image
+        cmd: |
+          git gh-tag 

ui/Makefile

@@ -33,18 +33,5 @@ docker: appjs
 	echo "git describe $(shell git describe --tags --always --dirty)"
 	docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)" -f Dockerfile --build-arg BASE_IMAGE="${BASE_IMAGE}" .
 
-docker-push: appjs
-	echo "Tag ${TAG}"
-	echo "Version ${VERSION}"
-	echo "CDP tag ${CDP_TAG}"
-	echo "git describe $(shell git describe --tags --always --dirty)"
-	docker buildx create --config /etc/cdp-buildkitd.toml --driver-opt network=host --bootstrap --use
-	docker buildx build --platform linux/amd64,linux/arm64 \
-						--build-arg BASE_IMAGE="${BASE_IMAGE}" \
-						-f Dockerfile \
-						-t "$(IMAGE):$(TAG)$(CDP_TAG)" \
-						--push .
-	echo "$(IMAGE):$(TAG)$(CDP_TAG)"
-					
 mock:
 	docker run -it -p 8081:8081 "$(IMAGE):$(TAG)" --mock