|
@@ -27,7 +27,7 @@ display_usage() {
|
27
|
27
|
echo "This script should be used as part of a CI strategy."
|
28
|
28
|
echo -e "Usage:\n build_image.sh [ARGUMENTS]"
|
29
|
29
|
echo -e "\nMandatory arguments \n"
|
30
|
|
- echo -e " repo_slug The git repository (e.g. bigbluebutton/greenlight)"
|
|
30
|
+ echo -e " repo_slug The git repository (e.g. blindsidenetworks/scalelite)"
|
31
|
31
|
echo -e "\nOptional arguments \n"
|
32
|
32
|
echo -e " branch | tag The branch (e.g. master | release-2.0.5)"
|
33
|
33
|
}
|
|
@@ -66,7 +66,7 @@ fi
|
66
|
66
|
if [[ "$CD_REF_NAME" == *"v"* ]]; then
|
67
|
67
|
export CD_BUILD_NUMBER=${CD_REF_NAME:1}
|
68
|
68
|
else
|
69
|
|
- export CD_BUILD_NUMBER="$CD_REF_NAME ($(expr substr $(git rev-parse HEAD) 1 7))"
|
|
69
|
+ export CD_BUILD_NUMBER="$CD_REF_NAME ($(eval git rev-parse --short=7 HEAD))"
|
70
|
70
|
fi
|
71
|
71
|
|
72
|
72
|
# Build the image
|
|
@@ -74,7 +74,7 @@ if [ -z $CD_DOCKER_REPO ]; then
|
74
|
74
|
export CD_DOCKER_REPO=$CD_REF_SLUG
|
75
|
75
|
fi
|
76
|
76
|
echo "#### Docker image $CD_DOCKER_REPO:$CD_REF_NAME is being built"
|
77
|
|
-docker build --build-arg build_number="${CD_BUILD_NUMBER}" -t $CD_DOCKER_REPO:$CD_REF_NAME .
|
|
77
|
+docker build --build-arg BUILD_NUMBER="${CD_BUILD_NUMBER}" -t $CD_DOCKER_REPO:$CD_REF_NAME .
|
78
|
78
|
|
79
|
79
|
if [ -z "$CD_DOCKER_USERNAME" ] || [ -z "$CD_DOCKER_PASSWORD" ]; then
|
80
|
80
|
echo "#### Docker image for $CD_DOCKER_REPO can't be published because CD_DOCKER_USERNAME or CD_DOCKER_PASSWORD are missing (Ignore this warning if running outside a CD/CI environment)"
|