From 0441ffde383eef779dcf3cf9beb1706699b2b5c0 Mon Sep 17 00:00:00 2001
From: inovindasari <ida.novindasari@zalando.de>
Date: Wed, 19 Nov 2025 16:00:15 +0100
Subject: [PATCH] change base image arguments

---
 delivery.yaml | 8 +++++---
 ui/Dockerfile | 2 +-
 ui/Makefile   | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/delivery.yaml b/delivery.yaml
index 576ace7ea..f51d53558 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -1,7 +1,9 @@
 version: "2017-09-20"
+allow_concurrent_steps: true
 
 build_env: &BUILD_ENV
-  BASE_IMAGE: container-registry.zalando.net/library/alpine-3.15
+  PYTHON_BASE_IMAGE: container-registry.zalando.net/library/python-3.11-slim
+  ALPINE_BASE_IMAGE: container-registry.zalando.net/library/alpine-3.15
   MULTI_ARCH_REGISTRY: container-registry-test.zalando.net/acid
 
 pipeline:
@@ -30,7 +32,7 @@ pipeline:
               IMAGE=${MULTI_ARCH_REGISTRY}/postgres-operator-test
             fi
 
-            IMAGE_TAG=$(make docker-push IMAGE=${IMAGE} BASE_IMAGE=${BASE_IMAGE})
+            IMAGE_TAG=$(make docker-push IMAGE=${IMAGE} BASE_IMAGE=${ALPINE_BASE_IMAGE})
 
             if [ -z ${CDP_SOURCE_BRANCH} ]; then
               cdp-promote-image ${IMAGE_TAG}
@@ -63,7 +65,7 @@ pipeline:
               IMAGE=${MULTI_ARCH_REGISTRY}/postgres-operator-ui-test
             fi
             
-            IMAGE_TAG=$(make docker-push IMAGE=${IMAGE} BASE_IMAGE=${BASE_IMAGE})
+            IMAGE_TAG=$(make docker-push IMAGE=${IMAGE} BASE_IMAGE=${PYTHON_BASE_IMAGE} NODE_IMAGE=${ALPINE_BASE_IMAGE})
 
             if [ -z ${CDP_SOURCE_BRANCH} ]; then
               cdp-promote-image ${IMAGE_TAG}
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 19f748d82..8ed70c2c0 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -17,7 +17,7 @@ WORKDIR /app
 
 RUN apt-get -qq -y update \
  # https://www.psycopg.org/docs/install.html#psycopg-vs-psycopg-binary
- && apt-get -qq -y install --no-install-recommends g++ libpq-dev python3-dev python3-setuptools \
+ && apt-get -qq -y install --no-install-recommends g++ libpq-dev python3-dev python3-distutils \
  && apt-get -qq -y clean \
  && rm -rf /var/lib/apt/lists/*
 
diff --git a/ui/Makefile b/ui/Makefile
index fe5da0e62..ae7c0c27d 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -31,7 +31,7 @@ docker: appjs
 	echo "Version ${VERSION}"
 	echo "CDP tag ${CDP_TAG}"
 	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 build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)" -f Dockerfile --build-arg BASE_IMAGE="${BASE_IMAGE}" --build-arg NODE_IMAGE="${NODE_IMAGE}" .
 
 docker-push: appjs
 	echo "Tag ${TAG}"
@@ -41,6 +41,7 @@ docker-push: 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="${BASE_IMAGE}" \
+						--build-arg NODE_IMAGE="${NODE_IMAGE}" \
 						-f Dockerfile \
 						-t "$(IMAGE):$(TAG)$(CDP_TAG)" \
 						--push .