File tree Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ echo "$DOCKER_LOGIN_OUTPUT"
34
34
35
35
# Build config and deploy environent
36
36
echo " $STARTMSG Build Configuration..." && $makefile_main build-config REPOURL=" $REGISTRY_URL "
37
- echo " $STARTMSG Pull Images..." && docker-compose -f current/docker-compose.yml -f current/docker-compose.override.yml pull
37
+ echo " $STARTMSG Pull Images..." && docker-compose -f current/docker-compose.yml -f current/docker-compose.override.yml pull -q
38
38
echo " $STARTMSG Start Environment..." && docker-compose -f current/docker-compose.yml -f current/docker-compose.override.yml up -d
39
39
# ##########################################################
40
40
# ATTENTION ATTENTION ATTENTION
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ if [ ! -z "$DOCKER_LOGIN_STATE" ]; then
68
68
func_tag " $REGISTRY_URL /misp-dockerized-proxy" " $PROXY_TAG "
69
69
func_tag " $REGISTRY_URL /misp-dockerized-robot" " $ROBOT_TAG "
70
70
func_tag " $REGISTRY_URL /misp-dockerized-misp-modules" " $MODULES_TAG "
71
- if $ version_gt " $VERSION " 1.1.0 ; then
71
+ if version_gt " $CURRENT_VERSION " " 1.1.0" ; then
72
72
func_tag " $REGISTRY_URL /misp-dockerized-redis" " $REDIS_TAG "
73
73
fi
74
74
# func_tag "$REGISTRY_URL/misp-dockerized-db" "$DB_TAG"
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ if [ ! -z "$DOCKER_LOGIN_STATE" ]; then
62
62
func_push " $REGISTRY_URL /misp-dockerized-proxy" " $PROXY_TAGS "
63
63
func_push " $REGISTRY_URL /misp-dockerized-robot" " $ROBOT_TAGS "
64
64
func_push " $REGISTRY_URL /misp-dockerized-misp-modules" " $MODULES_TAGS "
65
- if $ version_gt " $VERSION " 1.1.0 ; then
65
+ if version_gt " $CURRENT_VERSION " " 1.1.0" ; then
66
66
func_push " $REGISTRY_URL /misp-dockerized-redis" " $REDIS_TAGS "
67
67
fi
68
68
# func_push "$REGISTRY_URL/misp-dockerized-db" "$DB_TAGS"
You can’t perform that action at this time.
0 commit comments