Use modern docker compose plugin

OGGM · Nov 20, 2024 · bfb794f · bfb794f
1 parent ee1efa9
commit bfb794f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/bokeh/run_bokeh.sh b/bokeh/run_bokeh.sh
@@ -61,4 +61,3 @@ exec panel serve "$APP" \
 	--use-xheaders \
 	--num-procs "$BOKEH_NUM_PROCS" \
 	--prefix "$BOKEH_PREFIX"
-
diff --git a/runner/Dockerfile b/runner/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3
 
-RUN apk add --update --no-cache docker-cli docker-compose git bash
+RUN apk add --update --no-cache docker-cli docker-cli-compose git bash
 
 ENV \
 	WS_ORIGIN=bokeh.oggm.org

diff --git a/runner/run.sh b/runner/run.sh
@@ -5,11 +5,11 @@ rm -rf repo
 git clone https://github.com/OGGM/Bokeh-Docker.git repo
 cd repo/bokeh.oggm.org
 
-docker-compose down --remove-orphans
+docker compose down --remove-orphans
 docker system prune -f
-docker-compose pull
-docker-compose build --pull
-docker-compose up -d
+docker compose pull
+docker compose build --pull
+docker compose up -d
 
 while true; do
 	sleep 300
@@ -19,11 +19,11 @@ while true; do
 		git reset --hard FETCH_HEAD &&
 		git clean -fxd &&
 
-		docker-compose down --remove-orphans &&
+		docker compose down --remove-orphans &&
 		docker system prune -f &&
-		docker-compose pull &&
-		docker-compose build --pull &&
-		docker-compose up -d ||
+		docker compose pull &&
+		docker compose build --pull &&
+		docker compose up -d ||
 
 		git reset --hard ${OHEAD}
 	fi