projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reordering install_lightweight to init swarm before building docker images
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
ddff44a
..
36049cc
100755
(executable)
--- a/
installers/full_install_osm.sh
+++ b/
installers/full_install_osm.sh
@@
-959,12
+959,12
@@
function install_lightweight() {
[ -n "$INSTALL_NODOCKER" ] || install_docker_ce
track docker_ce
#install_docker_compose
[ -n "$INSTALL_NODOCKER" ] || install_docker_ce
track docker_ce
#install_docker_compose
+ [ -n "$INSTALL_NODOCKER" ] || init_docker_swarm
[ -z "$DOCKER_NOBUILD" ] && generate_docker_images
track docker_build
generate_docker_env_files
generate_config_log_folders
[ -z "$DOCKER_NOBUILD" ] && generate_docker_images
track docker_build
generate_docker_env_files
generate_config_log_folders
- [ -n "$INSTALL_NODOCKER" ] || init_docker_swarm
# remove old stack
remove_stack $OSM_STACK_NAME
create_docker_network
# remove old stack
remove_stack $OSM_STACK_NAME
create_docker_network