diff options
| author | jfederico <jesus@123it.ca> | 2020-02-13 13:27:26 -0500 |
|---|---|---|
| committer | jfederico <jesus@123it.ca> | 2020-02-13 13:27:26 -0500 |
| commit | af52c8cdbed69f36d33261603d4ee7d9c2d71611 (patch) | |
| tree | 827487d38d6aea5ed72ff0ec5c58d681ca6bf364 | |
| parent | a3830e3cc6be73b15df6f412fe41eacc7e9c51ed (diff) | |
| download | scalelite-run-itzks-af52c8cdbed69f36d33261603d4ee7d9c2d71611.tar.gz scalelite-run-itzks-af52c8cdbed69f36d33261603d4ee7d9c2d71611.tar.bz2 scalelite-run-itzks-af52c8cdbed69f36d33261603d4ee7d9c2d71611.zip | |
Updated substitution of BUILD_NUMBER
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rwxr-xr-x | scripts/build.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 901d41b..d3f0570 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: - ./nginx/sites.template:/etc/nginx/sites-available/sites.template - ./nginx/default/html:/var/www/html - ./nginx/log/nginx:/var/log/nginx - - ./data/certbot/conf:/etc/letsencrypt + - ./data/certbot/conf/live:/etc/letsencrypt/live - ./data/certbot/www:/var/www/certbot ports: - "80:80" diff --git a/scripts/build.sh b/scripts/build.sh index 15ac4c8..1da51e9 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -27,7 +27,7 @@ display_usage() { echo "This script should be used as part of a CI strategy." echo -e "Usage:\n build_image.sh [ARGUMENTS]" 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 " branch | tag The branch (e.g. master | release-2.0.5)" } @@ -66,7 +66,7 @@ fi if [[ "$CD_REF_NAME" == *"v"* ]]; then export CD_BUILD_NUMBER=${CD_REF_NAME:1} 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 # Build the image @@ -74,7 +74,7 @@ if [ -z $CD_DOCKER_REPO ]; then export CD_DOCKER_REPO=$CD_REF_SLUG fi 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 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)" |