From 3b0fe11157f86a99e6df54f416e63f3601ab809e Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 8 Sep 2026 08:30:30 -0400 Subject: [PATCH] GEODE-10637: Skip the native image when the branch has no Dockerfile geode-native keeps its Dockerfiles in per-distro subdirectories, so docker/Dockerfile is absent and the build and push steps fail. Run them only when that file is present. --- dev-tools/release/promote_rc.sh | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dev-tools/release/promote_rc.sh b/dev-tools/release/promote_rc.sh index af48a4c4de13..3d639fb49c7a 100755 --- a/dev-tools/release/promote_rc.sh +++ b/dev-tools/release/promote_rc.sh @@ -346,12 +346,16 @@ echo "" echo "============================================================" echo "Building Native docker image" echo "============================================================" -set -x -cd ${GEODE_NATIVE}/docker -docker build . || docker build . || docker build . -docker build -t apachegeode/geode-native-build:${VERSION} . -[ -n "$LATER" ] || docker build -t apachegeode/geode-native-build:latest . -set +x +if [ -f ${GEODE_NATIVE}/docker/Dockerfile ] ; then + set -x + cd ${GEODE_NATIVE}/docker + docker build . || docker build . || docker build . + docker build -t apachegeode/geode-native-build:${VERSION} . + [ -n "$LATER" ] || docker build -t apachegeode/geode-native-build:latest . + set +x +else + echo "geode-native has no docker/Dockerfile on this branch; skipping the native image build" +fi echo "" @@ -370,11 +374,15 @@ echo "" echo "============================================================" echo "Publishing Native docker image" echo "============================================================" -set -x -cd ${GEODE_NATIVE}/docker -docker push apachegeode/geode-native-build:${VERSION} -[ -n "$LATER" ] || docker push apachegeode/geode-native-build:latest -set +x +if [ -f ${GEODE_NATIVE}/docker/Dockerfile ] ; then + set -x + cd ${GEODE_NATIVE}/docker + docker push apachegeode/geode-native-build:${VERSION} + [ -n "$LATER" ] || docker push apachegeode/geode-native-build:latest + set +x +else + echo "geode-native has no docker/Dockerfile on this branch; skipping the native image push" +fi if [ -z "$LATER" ] ; then