diff --git a/install.sh b/install.sh index 694d7ef..5363222 100755 --- a/install.sh +++ b/install.sh @@ -12,7 +12,6 @@ export VERS_PIWIND='stable/2.3.x' export SERVER_IMG=coreoasis/api_server export WORKER_IMG=coreoasis/model_worker export GIT_PIWIND=OasisPiWind -export DOCKER_BIN=$(command -v podman >/dev/null 2>&1 && echo "podman" || echo "docker") MSG=$(cat <<-END Do you want to reinstall? @@ -33,15 +32,15 @@ if [[ $(docker volume ls | grep OasisData -c) -gt 1 || -d $SCRIPT_DIR/$GIT_PIWIN if [[ "$WIPE" == 1 ]]; then # stop oasisui_proxy if running - $DOCKER_BIN-compose -f $SCRIPT_DIR/oasis-ui-proxy.yml down --remove-orphans - $DOCKER_BIN-compose -f $SCRIPT_DIR/portainer.yaml down --remove-orphans + docker-compose -f $SCRIPT_DIR/oasis-ui-proxy.yml down --remove-orphans + docker-compose -f $SCRIPT_DIR/portainer.yaml down --remove-orphans set +e - $DOCKER_BIN-compose -f $SCRIPT_DIR/oasis-platform.yml -f $SCRIPT_DIR/oasis-ui-standalone.yml down --remove-orphans + docker-compose -f $SCRIPT_DIR/oasis-platform.yml -f $SCRIPT_DIR/oasis-ui-standalone.yml down --remove-orphans set -e printf "Deleting docker data: \n" rm -rf $SCRIPT_DIR/$GIT_PIWIND - $DOCKER_BIN volume ls | grep OasisData | awk 'BEGIN { FS = "[ \t\n]+" }{ print $2 }' | xargs -r $DOCKER_BIN volume rm + docker volume ls | grep OasisData | awk 'BEGIN { FS = "[ \t\n]+" }{ print $2 }' | xargs -r docker volume rm else echo "-- Reinstall aborted -- " exit 1 @@ -63,11 +62,11 @@ git checkout $VERS_PIWIND cd $SCRIPT_DIR set +e -$DOCKER_BIN pull ${WORKER_IMG}:${VERS_WORKER} -$DOCKER_BIN pull ${SERVER_IMG}:${VERS_API} -$DOCKER_BIN pull coreoasis/oasisui_app:$VERS_UI +docker pull ${WORKER_IMG}:${VERS_WORKER} +docker pull ${SERVER_IMG}:${VERS_API} +docker pull coreoasis/oasisui_app:$VERS_UI set -e # RUN OasisPlatform / OasisUI / Portainer -$DOCKER_BIN-compose -f $SCRIPT_DIR/oasis-platform.yml -f $SCRIPT_DIR/oasis-ui-standalone.yml up -d --no-build -# $DOCKER_BIN-compose -f $SCRIPT_DIR/portainer.yaml up -d +docker-compose -f $SCRIPT_DIR/oasis-platform.yml -f $SCRIPT_DIR/oasis-ui-standalone.yml up -d --no-build +docker-compose -f $SCRIPT_DIR/portainer.yaml up -d