From df23988f3d78f642fe0ec28a66d37959c2cf82e4 Mon Sep 17 00:00:00 2001
From: "Buster \"Silver Eagle\" Neece" <buster@busterneece.com>
Date: Wed, 23 Jun 2021 17:42:16 -0500
Subject: [PATCH] Compose updates.

---
 .github/workflows/default.yml |  2 +-
 docker-compose.dev.yml        |  2 --
 docker-compose.migrate.yml    |  2 --
 docker-compose.sample.yml     |  2 --
 docker-compose.testing.yml    |  2 --
 docker.sh                     | 66 ++++++++++++++++++++---------------
 6 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index f840fcae8..142153cc6 100644
--- a/.github/workflows/default.yml
+++ b/.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 : |
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index b82675171..0c49b0f28 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
   nginx_proxy:
     build:
diff --git a/docker-compose.migrate.yml b/docker-compose.migrate.yml
index 326bccfc0..83bad38c4 100644
--- a/docker-compose.migrate.yml
+++ b/docker-compose.migrate.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
 services:
   web:
     volumes:
diff --git a/docker-compose.sample.yml b/docker-compose.sample.yml
index 86d18cc46..a6c1d6c79 100644
--- a/docker-compose.sample.yml
+++ b/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
diff --git a/docker-compose.testing.yml b/docker-compose.testing.yml
index 10c8b667c..c2a1d1f94 100644
--- a/docker-compose.testing.yml
+++ b/docker-compose.testing.yml
@@ -1,5 +1,3 @@
-version : '2.2'
-
 services :
   web :
     build :
diff --git a/docker.sh b/docker.sh
index afe602c81..c428950d9 100755
--- a/docker.sh
+++ b/docker.sh
@@ -219,6 +219,41 @@ add-ports-to-docker-compose() {
   yq eval ".services.web.ports += [$PORTS]" -i docker-compose.yml
 }
 
+install-docker() {
+  curl -fsSL get.docker.com -o get-docker.sh
+  sh get-docker.sh
+  rm get-docker.sh
+
+  if [[ $EUID -ne 0 ]]; then
+    sudo usermod -aG docker "$(whoami)"
+
+    echo "You must log out or restart to apply necessary Docker permissions changes."
+    echo "Restart, then continue installing using this script."
+    exit
+  fi
+}
+
+install-docker-compose() {
+  local COMPOSE_VERSION=1.29.2
+
+  if [[ $EUID -ne 0 ]]; then
+    if [[ ! $(command -v sudo) ]]; then
+      echo "Sudo does not appear to be installed."
+      echo "Install sudo using your host's package manager,"
+      echo "then continue installing using this script."
+      exit 1
+    fi
+
+    sudo sh -c "curl -fsSL https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose"
+    sudo chmod +x /usr/local/bin/docker-compose
+    sudo sh -c "curl -fsSL https://raw.githubusercontent.com/docker/compose/${COMPOSE_VERSION}/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose"
+  else
+    curl -fsSL 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
+    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
@@ -235,17 +270,7 @@ install() {
     echo "Docker is already installed! Continuing..."
   else
     if ask "Docker does not appear to be installed. Install Docker now?" Y; then
-      curl -fsSL get.docker.com -o get-docker.sh
-      sh get-docker.sh
-      rm get-docker.sh
-
-      if [[ $EUID -ne 0 ]]; then
-        sudo usermod -aG docker "$(whoami)"
-
-        echo "You must log out or restart to apply necessary Docker permissions changes."
-        echo "Restart, then continue installing using this script."
-        exit
-      fi
+      install-docker
     fi
   fi
 
@@ -253,24 +278,7 @@ install() {
     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
-
-      if [[ $EUID -ne 0 ]]; then
-        if [[ ! $(command -v sudo) ]]; then
-          echo "Sudo does not appear to be installed."
-          echo "Install sudo using your host's package manager,"
-          echo "then continue installing using this script."
-          exit 1
-        fi
-
-        sudo sh -c "curl -fsSL https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose"
-        sudo chmod +x /usr/local/bin/docker-compose
-        sudo sh -c "curl -fsSL https://raw.githubusercontent.com/docker/compose/${COMPOSE_VERSION}/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose"
-      else
-        curl -fsSL 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
-        curl -fsSL https://raw.githubusercontent.com/docker/compose/${COMPOSE_VERSION}/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
-      fi
+      install-docker-compose
     fi
   fi