Compose updates.

.github/workflows/default.yml

@@ -122,7 +122,7 @@ jobs :
         run : |
           chmod 777 tests/_output/
           chmod 777 tests/_support/_generated
-          docker-compose exec -T --user="azuracast" web composer codeception-no-coverage
+          docker-compose exec -T --user="azuracast" web vendor/bin/codecept run --no-interaction
 
       - name : Stop all running containers.
         run : |

docker-compose.dev.yml

@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
   nginx_proxy:
     build:

docker-compose.migrate.yml

@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
   web:
     volumes:

docker-compose.sample.yml

@@ -9,8 +9,6 @@
 #   docker-compose.override.yml
 # with any changes you need to make.
 #
-version : '2.2'
-
 services :
   nginx_proxy :
     container_name : nginx_proxy

docker-compose.testing.yml

@@ -1,5 +1,3 @@
-version : '2.2'
-
 services :
   web :
     build :

docker.sh

@@ -219,22 +219,7 @@ add-ports-to-docker-compose() {
   yq eval ".services.web.ports += [$PORTS]" -i docker-compose.yml
 }
 
-#
-# Run the initial installer of Docker and AzuraCast.
-# Usage: ./docker.sh install
-#
-install() {
-  if [[ ! $(command -v curl) ]]; then
-    echo "cURL does not appear to be installed."
-    echo "Install curl using your host's package manager,"
-    echo "then continue installing using this script."
-    exit 1
-  fi
-
-  if [[ $(command -v docker) && $(docker --version) ]]; then
-    echo "Docker is already installed! Continuing..."
-  else
-    if ask "Docker does not appear to be installed. Install Docker now?" Y; then
+install-docker() {
   curl -fsSL get.docker.com -o get-docker.sh
   sh get-docker.sh
   rm get-docker.sh
@@ -246,14 +231,10 @@ install() {
     echo "Restart, then continue installing using this script."
     exit
   fi
-    fi
-  fi
+}
 
-  if [[ $(command -v docker-compose) && $(docker-compose --version) ]]; then
-    echo "Docker Compose is already installed! Continuing..."
-  else
-    if ask "Docker Compose does not appear to be installed. Install Docker Compose now?" Y; then
-      local COMPOSE_VERSION=1.25.3
+install-docker-compose() {
+  local COMPOSE_VERSION=1.29.2
 
   if [[ $EUID -ne 0 ]]; then
     if [[ ! $(command -v sudo) ]]; then
@@ -271,6 +252,33 @@ install() {
     chmod +x /usr/local/bin/docker-compose
     curl -fsSL https://raw.githubusercontent.com/docker/compose/${COMPOSE_VERSION}/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
   fi
+}
+
+#
+# Run the initial installer of Docker and AzuraCast.
+# Usage: ./docker.sh install
+#
+install() {
+  if [[ ! $(command -v curl) ]]; then
+    echo "cURL does not appear to be installed."
+    echo "Install curl using your host's package manager,"
+    echo "then continue installing using this script."
+    exit 1
+  fi
+
+  if [[ $(command -v docker) && $(docker --version) ]]; then
+    echo "Docker is already installed! Continuing..."
+  else
+    if ask "Docker does not appear to be installed. Install Docker now?" Y; then
+      install-docker
+    fi
+  fi
+
+  if [[ $(command -v docker-compose) && $(docker-compose --version) ]]; then
+    echo "Docker Compose is already installed! Continuing..."
+  else
+    if ask "Docker Compose does not appear to be installed. Install Docker Compose now?" Y; then
+      install-docker-compose
     fi
   fi