Skip to content

Commit

Permalink
fix: docker compose command check (#151)
Browse files Browse the repository at this point in the history
zsq1234 authored Sep 25, 2024
1 parent 5b225ec commit 9388547
Showing 2 changed files with 16 additions and 10 deletions.
12 changes: 7 additions & 5 deletions docker-compose/run.sh
Original file line number Diff line number Diff line change
@@ -7,12 +7,14 @@ if [ "$PLATFORM" == "Darwin" ]; then
fi

DOCKER_COMPOSE="docker compose"
if [! $DOCKER_COMPOSE version] &> /dev/null; then
$DOCKER_COMPOSE version &>/dev/null
if [ $? -ne 0 ]; then
DOCKER_COMPOSE="docker-compose"
fi
if [! $DOCKER_COMPOSE version] &> /dev/null; then
echo "need docker compose."
exit 1
$DOCKER_COMPOSE version &>/dev/null
if [ $? -ne 0 ]; then
echo "need docker compose."
exit 1
fi
fi

COMPOSE_FILE="docker-compose.yaml"
14 changes: 9 additions & 5 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash

set -eu

_CI_TEST=${_CI_TEST:-false}

# get os type
@@ -59,9 +57,13 @@ if ! [ -x "$(command -v docker)" ]; then
esac
fi

if ! [ -x "$(command -v docker-compose)" ] && ! [ -x "$(command -v docker compose)" ]; then
echo "Error: docker-compose is not installed." >&2
exit 1
docker compose version &>/dev/null
if [ $? -ne 0 ]; then
docker-compose version &>/dev/null
if [ $? -ne 0 ]; then
echo "Error: docker compose is not installed."
exit 1
fi
fi

# check docker daemon
@@ -70,6 +72,8 @@ if ! docker info > /dev/null 2>&1; then
exit 1
fi

set -eu

# check docker version
_docker_version=$(docker version --format '{{ .Server.Version }}')
if [ "$(printf '%s\n' "$_docker_version" "23.0" | sort -V | head -n1)" == "$_docker_version" ] && [ "$_docker_version" != "23.0" ]; then

0 comments on commit 9388547

Please sign in to comment.