@@ -20,7 +20,11 @@ GEDS_VERSION=${TRAVIS_TAG:-$(git describe --tags --match "v*" --dirty)}
20
20
[[ " $GEDS_VERSION " =~ ^v ]] && GEDS_VERSION=$( echo $GEDS_VERSION | cut -c 2-)
21
21
22
22
DOCKER_IMAGE_PREFIX=${DOCKER_IMAGE_PREFIX:- " zac32.zurich.ibm.com/zrlio/" }
23
+ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:- Release}
23
24
IMAGE_PREFIX=geds-dev_${DOCKER_BUILD_TARGET}
25
+ if [[ " ${CMAKE_BUILD_TYPE} " != " Release" ]]; then
26
+ IMAGE_PREFIX=${IMAGE_PREFIX} -${CMAKE_BUILD_TYPE,,}
27
+ fi
24
28
IMAGE_NAME=${IMAGE_PREFIX} :${GEDS_DOCKER_VERSION}
25
29
echo $IMAGE_NAME
26
30
IMAGE=${DOCKER_IMAGE_PREFIX}${IMAGE_PREFIX}
@@ -46,6 +50,7 @@ docker build -t geds-build/${DOCKER_BUILD_TARGET}:${GIT_REVISION} \
46
50
--build-arg GEDS_VERSION=${GEDS_VERSION} \
47
51
--build-arg DOCKER_BUILD_TARGET=${DOCKER_BUILD_TARGET} \
48
52
--build-arg CMAKE_BUILD_PARALLEL_LEVEL=$(( $(nproc) + 1 )) \
53
+ --build-arg CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
49
54
-f docker/Dockerfile-build .
50
55
51
56
docker build -t ${IMAGE_NAME} \
@@ -63,5 +68,5 @@ echo "Built ${IMAGE}:${GEDS_VERSION}"
63
68
docker push $IMAGE :latest
64
69
docker push $IMAGE :${GEDS_VERSION}
65
70
66
- echo " Pushed ${IMAGE} :latest"
71
+ echo " Pushed ${IMAGE} :latest"
67
72
echo " Pushed ${IMAGE} :${GEDS_VERSION} "
0 commit comments