From 3408618a22b782c5fc99b7faeb5f0add8e4c7b10 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 8 Feb 2022 17:26:41 +0100
Subject: [PATCH] docker/l3d#107 Use docker compose instead of docker-compose
---
run/Dockerfile | 2 --
run/scripts/delete | 2 +-
start.sh | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/run/Dockerfile b/run/Dockerfile
index cbd805e..e99b1b2 100644
--- a/run/Dockerfile
+++ b/run/Dockerfile
@@ -23,8 +23,6 @@ RUN apk add --no-cache bash curl jq && \
ln -s /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
ln -s /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
- wget -q https://github.com/docker/compose/releases/download/${compose_version}/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose && \
- chmod +x /usr/local/bin/docker-compose && \
mkdir -p /usr/local/lib/docker/cli-plugins && \
curl -SL https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
diff --git a/run/scripts/delete b/run/scripts/delete
index d187b45..9a9e349 100755
--- a/run/scripts/delete
+++ b/run/scripts/delete
@@ -32,7 +32,7 @@ function removenetwork() {
function rebuildtraefik() {
cd ${HOME}/.traefik || return
if [[ -f "docker-compose.yml" ]]; then
- docker-compose --project-name traefik up -d --remove-orphans
+ docker compose --project-name traefik up -d --remove-orphans
fi
if [[ "$NETWORKS" == "" ]]; then
return
diff --git a/start.sh b/start.sh
index e5a18c3..7852bb4 100755
--- a/start.sh
+++ b/start.sh
@@ -94,8 +94,8 @@ function create {
# Cleanup
if [[ $L3D_CLEANUP -eq 1 ]]; then
- docker-compose stop
- docker-compose rm --force -v
+ docker compose stop
+ docker compose rm --force -v
fi
fi
fi
--
GitLab