Improve dev/openmage/install.sh script for newer versions of Docker - no longer requires separate compose.

Author: colinmollenhour

dev/openmage/install.sh

@@ -2,6 +2,16 @@
 set -e
 dir=$(dirname "${BASH_SOURCE[0]}")
 cd $dir
+
+# Detect "docker compose" or "docker-compose"
+dc="docker compose"
+if ! docker compose --help >/dev/null; then
+  if ! command -v docker-compose 2>&1 >/dev/null; then
+    echo "Please first install docker-compose."
+  else
+    dc="docker-compose"
+  fi
+fi
 test -f .env && source .env
 
 HOST_PORT=":${HOST_PORT:-80}"
@@ -15,28 +25,29 @@ if test -f ../../app/etc/local.xml; then
   echo "Already installed!";
   if [[ "$1" = "--reset" ]]; then
     echo "Wiping previous installation..."
-    cd $dir && docker-compose down --volumes && rm ../../app/etc/local.xml
+    cd $dir && $dc down --volumes && rm ../../app/etc/local.xml
   else
     echo "Visit ${BASE_URL}admin and login with '$ADMIN_USERNAME' : '$ADMIN_PASSWORD'"
-    echo "MySQL server IP: $(docker exec openmage_apache_1 getent hosts mysql | awk '{print $1}')"
+    echo "MySQL server IP: $($dc exec apache getent hosts mysql | awk '{print $1}')"
     echo "To start a clean installation run: $0 --reset"
     exit 1
   fi
 fi
 
-chmod 777 ../../app/etc ../../media ../../var
-
-docker-compose up -d mysql apache
-sleep 4
+echo "Preparing filesystem..."
+chmod 777 ../../app/etc ../../media
+$dc run --rm --no-deps cli mkdir -p var/cache var/log var/locks var/session
 
 echo "Starting services..."
+$dc up -d mysql apache
+sleep 4
 for i in $(seq 1 20); do
   sleep 1
-  docker exec openmage_mysql_1 mysql -e 'show databases;' 2>/dev/null | grep -qF 'openmage' && break
+  $dc exec mysql mysql -e 'show databases;' 2>/dev/null | grep -qF 'openmage' && break
 done
 
 echo "Installing OpenMage LTS..."
-docker-compose run --rm cli php install.php \
+$dc run --rm cli php install.php \
   --license_agreement_accepted yes \
   --locale en_US \
   --timezone America/New_York \
@@ -60,4 +71,4 @@ docker-compose run --rm cli php install.php \
 echo ""
 echo "Setup is complete!"
 echo "Visit ${BASE_URL}admin and login with '$ADMIN_USERNAME' : '$ADMIN_PASSWORD'"
-echo "MySQL server IP: $(docker exec openmage_apache_1 getent hosts mysql | awk '{print $1}')"
+echo "MySQL server IP: $($dc exec apache getent hosts mysql | awk '{print $1}')"