p15693087
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Deployments: fix the extraction of commit number in docker.sh

This commit is contained in:
VakarisZ 2021-10-19 12:12:25 +03:00 committed by Ilija Lazoroski
parent 46ef9df1d2
commit eedf4484bc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_scripts/docker/docker.sh
View File

@ -15,6 +15,8 @@ setup_build_dir() {
copy_entrypoint_to_build_dir "$build_dir" copy_entrypoint_to_build_dir "$build_dir"
build_commit=$(git rev-parse --git-dir "$monkey_repo" --short HEAD)
copy_monkey_island_to_build_dir "$monkey_repo/monkey" "$build_dir" copy_monkey_island_to_build_dir "$monkey_repo/monkey" "$build_dir"
copy_server_config_to_build_dir "$build_dir" copy_server_config_to_build_dir "$build_dir"
modify_deployment "$deployment_type" "$build_dir" modify_deployment "$deployment_type" "$build_dir"
@ -40,9 +42,9 @@ build_package() {
pushd ./docker pushd ./docker
if [ -n "$1" ]; then if [ -n "$1" ]; then
version="v$(git rev-parse --short HEAD)"
else
version="v$version" version="v$version"
else
version="v$build_commit"
fi fi
docker_image_name="guardicore/monkey-island:$version" docker_image_name="guardicore/monkey-island:$version"