From 25df96da63ce6f6191eb85d3585897f81891717e Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Mon, 18 Oct 2021 17:45:14 +0300 Subject: [PATCH] Deployments: Rename docker deployment only if a version is not specified With this change, Jenkins will output docker packages in the following naming conventions: Develop: InfectionMonkey-docker-$commit_number.tgz Release: InfectionMonkey-docker-v$version.tgz --- build_scripts/docker/docker.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build_scripts/docker/docker.sh b/build_scripts/docker/docker.sh index 24fdd6455..860667de6 100755 --- a/build_scripts/docker/docker.sh +++ b/build_scripts/docker/docker.sh @@ -39,12 +39,18 @@ build_package() { local dist_dir=$2 pushd ./docker + if [ -n "$1" ]; then + version="v$(git rev-parse --short HEAD)" + else + version="v$version" + fi + docker_image_name="guardicore/monkey-island:$version" - tar_name="$DOCKER_DIR/InfectionMonkey-docker-v$version.tar" + tar_name="$DOCKER_DIR/InfectionMonkey-docker-$version.tar" build_docker_image_tar "$docker_image_name" "$tar_name" - tgz_name="$DOCKER_DIR/InfectionMonkey-docker-v$version.tgz" + tgz_name="$DOCKER_DIR/InfectionMonkey-docker-$version.tgz" build_docker_image_tgz "$tar_name" "$tgz_name" move_package_to_dist_dir $tgz_name $dist_dir