Skip to content

Commit 02b1bae

Browse files
committed
update to simply replace docker-compose with docker compose
1 parent 277b432 commit 02b1bae

1 file changed

Lines changed: 6 additions & 18 deletions

File tree

mwaa-local-env

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,6 @@
33
AIRFLOW_VERSION=2_10
44
DOCKER_COMPOSE_PROJECT_NAME=aws-mwaa-local-runner-$AIRFLOW_VERSION
55

6-
# Detect available docker compose command
7-
detect_docker_compose() {
8-
if command -v docker-compose >/dev/null 2>&1; then
9-
echo "docker-compose"
10-
elif docker compose version >/dev/null 2>&1; then
11-
echo "docker compose"
12-
else
13-
echo ""
14-
fi
15-
}
16-
17-
DOCKER_COMPOSE_CMD=$(detect_docker_compose)
18-
196
display_help() {
207
# Display Help
218
echo "======================================"
@@ -43,10 +30,11 @@ validate_prereqs() {
4330
echo -e "Docker is Installed. \xE2\x9C\x94"
4431
fi
4532

46-
if [ -z "$DOCKER_COMPOSE_CMD" ]; then
47-
echo -e "Neither 'docker-compose' nor 'docker compose' is available. \xE2\x9D\x8C"
33+
docker compose -v >/dev/null 2>&1
34+
if [ $? -ne 0 ]; then
35+
echo -e "Docker compose is not installed. \xE2\x9D\x8C"
4836
else
49-
echo -e "Docker compose is Installed ($DOCKER_COMPOSE_CMD). \xE2\x9C\x94"
37+
echo -e "Docker compose is installed \xE2\x9C\x94"
5038
fi
5139

5240
python3 --version >/dev/null 2>&1
@@ -106,10 +94,10 @@ build-image)
10694
build_image
10795
;;
10896
reset-db)
109-
$DOCKER_COMPOSE_CMD -p $DOCKER_COMPOSE_PROJECT_NAME -f ./docker/docker-compose-resetdb.yml up --abort-on-container-exit
97+
docker compose -p $DOCKER_COMPOSE_PROJECT_NAME -f ./docker/docker-compose-resetdb.yml up --abort-on-container-exit
11098
;;
11199
start)
112-
$DOCKER_COMPOSE_CMD -p $DOCKER_COMPOSE_PROJECT_NAME -f ./docker/docker-compose-local.yml up
100+
docker compose -p $DOCKER_COMPOSE_PROJECT_NAME -f ./docker/docker-compose-local.yml up
113101
;;
114102
help)
115103
display_help

0 commit comments

Comments
 (0)