use node:lts-alpine in both
This commit is contained in:
parent
0441ffde38
commit
6d6746a915
|
|
@ -65,7 +65,7 @@ pipeline:
|
|||
IMAGE=${MULTI_ARCH_REGISTRY}/postgres-operator-ui-test
|
||||
fi
|
||||
|
||||
IMAGE_TAG=$(make docker-push IMAGE=${IMAGE} BASE_IMAGE=${PYTHON_BASE_IMAGE} NODE_IMAGE=${ALPINE_BASE_IMAGE})
|
||||
IMAGE_TAG=$(make docker-push IMAGE=${IMAGE} BASE_IMAGE=${PYTHON_BASE_IMAGE})
|
||||
|
||||
if [ -z ${CDP_SOURCE_BRANCH} ]; then
|
||||
cdp-promote-image ${IMAGE_TAG}
|
||||
|
|
|
|||
|
|
@ -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}" --build-arg NODE_IMAGE="${NODE_IMAGE}" .
|
||||
docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)" -f Dockerfile --build-arg BASE_IMAGE="${BASE_IMAGE}" --build-arg .
|
||||
|
||||
docker-push: appjs
|
||||
echo "Tag ${TAG}"
|
||||
|
|
@ -41,7 +41,6 @@ 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 .
|
||||
|
|
|
|||
Loading…
Reference in New Issue