Skip to content

Commit 663900a

Browse files
committed
Revert "Support podman if on system (#45)"
This reverts commit db38ce3.
1 parent 211308f commit 663900a

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

install.sh

+9-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export VERS_PIWIND='stable/2.3.x'
1212
export SERVER_IMG=coreoasis/api_server
1313
export WORKER_IMG=coreoasis/model_worker
1414
export GIT_PIWIND=OasisPiWind
15-
export DOCKER_BIN=$(command -v podman >/dev/null 2>&1 && echo "podman" || echo "docker")
1615

1716
MSG=$(cat <<-END
1817
Do you want to reinstall?
@@ -33,15 +32,15 @@ if [[ $(docker volume ls | grep OasisData -c) -gt 1 || -d $SCRIPT_DIR/$GIT_PIWIN
3332

3433
if [[ "$WIPE" == 1 ]]; then
3534
# stop oasisui_proxy if running
36-
$DOCKER_BIN-compose -f $SCRIPT_DIR/oasis-ui-proxy.yml down --remove-orphans
37-
$DOCKER_BIN-compose -f $SCRIPT_DIR/portainer.yaml down --remove-orphans
35+
docker-compose -f $SCRIPT_DIR/oasis-ui-proxy.yml down --remove-orphans
36+
docker-compose -f $SCRIPT_DIR/portainer.yaml down --remove-orphans
3837

3938
set +e
40-
$DOCKER_BIN-compose -f $SCRIPT_DIR/oasis-platform.yml -f $SCRIPT_DIR/oasis-ui-standalone.yml down --remove-orphans
39+
docker-compose -f $SCRIPT_DIR/oasis-platform.yml -f $SCRIPT_DIR/oasis-ui-standalone.yml down --remove-orphans
4140
set -e
4241
printf "Deleting docker data: \n"
4342
rm -rf $SCRIPT_DIR/$GIT_PIWIND
44-
$DOCKER_BIN volume ls | grep OasisData | awk 'BEGIN { FS = "[ \t\n]+" }{ print $2 }' | xargs -r $DOCKER_BIN volume rm
43+
docker volume ls | grep OasisData | awk 'BEGIN { FS = "[ \t\n]+" }{ print $2 }' | xargs -r docker volume rm
4544
else
4645
echo "-- Reinstall aborted -- "
4746
exit 1
@@ -63,11 +62,11 @@ git checkout $VERS_PIWIND
6362
cd $SCRIPT_DIR
6463

6564
set +e
66-
$DOCKER_BIN pull ${WORKER_IMG}:${VERS_WORKER}
67-
$DOCKER_BIN pull ${SERVER_IMG}:${VERS_API}
68-
$DOCKER_BIN pull coreoasis/oasisui_app:$VERS_UI
65+
docker pull ${WORKER_IMG}:${VERS_WORKER}
66+
docker pull ${SERVER_IMG}:${VERS_API}
67+
docker pull coreoasis/oasisui_app:$VERS_UI
6968
set -e
7069

7170
# RUN OasisPlatform / OasisUI / Portainer
72-
$DOCKER_BIN-compose -f $SCRIPT_DIR/oasis-platform.yml -f $SCRIPT_DIR/oasis-ui-standalone.yml up -d --no-build
73-
# $DOCKER_BIN-compose -f $SCRIPT_DIR/portainer.yaml up -d
71+
docker-compose -f $SCRIPT_DIR/oasis-platform.yml -f $SCRIPT_DIR/oasis-ui-standalone.yml up -d --no-build
72+
docker-compose -f $SCRIPT_DIR/portainer.yaml up -d

0 commit comments

Comments
 (0)