Michelle/scalelite-run
1
0
Fork 0
mirror of https://github.com/michelleDeko/scalelite-run.git synced 2026-02-05 07:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated substitution of BUILD_NUMBER

Browse Source
This commit is contained in:
jfederico
2020-02-13 13:27:26 -05:00
parent a3830e3cc6
commit af52c8cdbe
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@@ -14,7 +14,7 @@ services:
- ./nginx/sites.template:/etc/nginx/sites-available/sites.template - ./nginx/sites.template:/etc/nginx/sites-available/sites.template
- ./nginx/default/html:/var/www/html - ./nginx/default/html:/var/www/html
- ./nginx/log/nginx:/var/log/nginx - ./nginx/log/nginx:/var/log/nginx
- ./data/certbot/conf:/etc/letsencrypt - ./data/certbot/conf/live:/etc/letsencrypt/live
- ./data/certbot/www:/var/www/certbot - ./data/certbot/www:/var/www/certbot
ports: ports:
- "80:80" - "80:80"

6
scripts/build.sh
View File

@@ -27,7 +27,7 @@ display_usage() {
echo "This script should be used as part of a CI strategy." echo "This script should be used as part of a CI strategy."
echo -e "Usage:\n build_image.sh [ARGUMENTS]" echo -e "Usage:\n build_image.sh [ARGUMENTS]"
echo -e "\nMandatory arguments \n" echo -e "\nMandatory arguments \n"
echo -e " repo_slug The git repository (e.g. bigbluebutton/greenlight)" echo -e " repo_slug The git repository (e.g. blindsidenetworks/scalelite)"
echo -e "\nOptional arguments \n" echo -e "\nOptional arguments \n"
echo -e " branch | tag The branch (e.g. master | release-2.0.5)" echo -e " branch | tag The branch (e.g. master | release-2.0.5)"
} }
@@ -66,7 +66,7 @@ fi
if [[ "$CD_REF_NAME" == *"v"* ]]; then if [[ "$CD_REF_NAME" == *"v"* ]]; then
export CD_BUILD_NUMBER=${CD_REF_NAME:1} export CD_BUILD_NUMBER=${CD_REF_NAME:1}
else else
export CD_BUILD_NUMBER="$CD_REF_NAME ($(expr substr $(git rev-parse HEAD) 1 7))" export CD_BUILD_NUMBER="$CD_REF_NAME ($(eval git rev-parse --short=7 HEAD))"
fi fi
# Build the image # Build the image
@@ -74,7 +74,7 @@ if [ -z $CD_DOCKER_REPO ]; then
export CD_DOCKER_REPO=$CD_REF_SLUG export CD_DOCKER_REPO=$CD_REF_SLUG
fi fi
echo "#### Docker image $CD_DOCKER_REPO:$CD_REF_NAME is being built" echo "#### Docker image $CD_DOCKER_REPO:$CD_REF_NAME is being built"
docker build --build-arg build_number="${CD_BUILD_NUMBER}" -t $CD_DOCKER_REPO:$CD_REF_NAME . docker build --build-arg BUILD_NUMBER="${CD_BUILD_NUMBER}" -t $CD_DOCKER_REPO:$CD_REF_NAME .
if [ -z "$CD_DOCKER_USERNAME" ] || [ -z "$CD_DOCKER_PASSWORD" ]; then if [ -z "$CD_DOCKER_USERNAME" ] || [ -z "$CD_DOCKER_PASSWORD" ]; then
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)" 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)"