Merge remote-tracking branch 'ezplatform-ee/1.13' into 2.5

ezsystems · Jun 4, 2020 · a2a071c · a2a071c
2 parents 21ff17f + 914f321
commit a2a071c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/bin/.travis/trusty/update_docker.sh b/bin/.travis/trusty/update_docker.sh
@@ -24,9 +24,15 @@ if (( $(echo "$dc < 1.23" |bc -l) )); then
     DOCKER_COMPOSE_VERSION="1.23.2"
     echo "Updating Docker Compose from ${dc} (${dc_full}) to ${DOCKER_COMPOSE_VERSION}"
     sudo rm -f /usr/local/bin/docker-compose
-    curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-    chmod +x docker-compose
-    sudo mv docker-compose /usr/local/bin
+    curl --retry 5 -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+    FILE_TYPE=$(file -b --mime-type docker-compose | sed 's|/.*||')
+    if [[ $FILE_TYPE == "application" ]]; then
+        chmod +x docker-compose
+        sudo mv docker-compose /usr/local/bin
+    else
+        echo "Error when downloading docker-compose"
+        cat docker-compose
+    fi
 else
     echo "Skip updating Docker Compose ${dc} (${dc_full})"
 fi