[dd-ctl] Fix installations without docker
When we improved the update process, we introduced a deadlock when not having docker. By separating update from repo-update we can differentiate those cases: - update: full update of an existing installation - repo-update: bring repository to latest standmejoras_instalacion
parent
2d057ec6bc
commit
5bb3afe2aa
23
dd-ctl
23
dd-ctl
|
@ -157,16 +157,20 @@ ddupdate(){
|
|||
# Bring down services
|
||||
./dd-ctl down
|
||||
# Switch to latest version
|
||||
git fetch && git checkout $REPO_BRANCH
|
||||
git fetch && git checkout "$REPO_BRANCH"
|
||||
git pull --rebase --autostash
|
||||
# Needed for dd-apps submodules...
|
||||
git submodule update --init --recursive
|
||||
# Rebuild containers
|
||||
./dd-ctl build
|
||||
# Upgrade plugins
|
||||
./dd-ctl upgrade-plugins
|
||||
# Reapply customisations if needed
|
||||
./dd-ctl customize
|
||||
case "${1}" in
|
||||
--full)
|
||||
# Rebuild containers
|
||||
./dd-ctl build
|
||||
# Upgrade plugins
|
||||
./dd-ctl upgrade-plugins
|
||||
# Reapply customisations if needed
|
||||
./dd-ctl customize
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
build_compose(){
|
||||
|
@ -792,7 +796,10 @@ case "$OPERATION" in
|
|||
prerequisites_docker
|
||||
prerequisites_pwd
|
||||
;;
|
||||
update|repo-update)
|
||||
update)
|
||||
ddupdate --full
|
||||
;;
|
||||
repo-update)
|
||||
ddupdate
|
||||
;;
|
||||
reset-data|reset-1714)
|
||||
|
|
Loading…
Reference in New Issue