change docker-compose -> docker compose

This commit is contained in:
olli 2023-04-19 09:15:58 +02:00
parent a39e3839da
commit 75f22f0968

View File

@ -108,20 +108,20 @@
[ -f "$docker/docker-compose.yml" ] || continue [ -f "$docker/docker-compose.yml" ] || continue
g_echo_ok "$docker" g_echo_ok "$docker"
cd "${docker}" cd "${docker}"
if docker-compose -l warn --no-ansi pull --include-deps 2>&1 | grep "download complete" if docker compose -l warn --no-ansi pull --include-deps 2>&1 | grep "download complete"
then then
g_echo_warn "Installiere $docker Update" g_echo_warn "Installiere $docker Update"
docker-compose -l warn --no-ansi down >$g_tmp/down 2>&1 || g_echo_error "$docker: docker-compose pull fehlgeschlagen: $(cat $g_tmp/down)" docker compose -l warn --no-ansi down >$g_tmp/down 2>&1 || g_echo_error "$docker: docker compose pull fehlgeschlagen: $(cat $g_tmp/down)"
docker-compose -l warn --no-ansi up -d >$g_tmp/up 2>&1 || g_echo_error "$docker: docker-compose up fehlgeschlagen: $(cat $g_tmp/up)" docker compose -l warn --no-ansi up -d >$g_tmp/up 2>&1 || g_echo_error "$docker: docker compose up fehlgeschlagen: $(cat $g_tmp/up)"
fi fi
if [ -f Dockerfile ] if [ -f Dockerfile ]
then then
if docker-compose -l warn --no-ansi build --pull --no-cache --force-rm >$g_tmp/build 2>&1 if docker compose -l warn --no-ansi build --pull --no-cache --force-rm >$g_tmp/build 2>&1
then then
docker-compose -l warn --no-ansi down >$g_tmp/down 2>&1 || g_echo_error "$docker: docker-compose pull fehlgeschlagen: $(cat $g_tmp/down)" docker compose -l warn --no-ansi down >$g_tmp/down 2>&1 || g_echo_error "$docker: docker compose pull fehlgeschlagen: $(cat $g_tmp/down)"
docker-compose -l warn --no-ansi up -d >$g_tmp/up 2>&1 || g_echo_error "$docker: docker-compose up fehlgeschlagen: $(cat $g_tmp/up)" docker compose -l warn --no-ansi up -d >$g_tmp/up 2>&1 || g_echo_error "$docker: docker compose up fehlgeschlagen: $(cat $g_tmp/up)"
else else
g_echo_error "$docker: docker-compose build fehlgeschlagen: $(cat $g_tmp/build)" g_echo_error "$docker: docker compose build fehlgeschlagen: $(cat $g_tmp/build)"
fi fi
fi fi
done done