Stop installing docker-compose as is already part of TravisCI env

Author: elgalu

.travis.yml

@@ -1,8 +1,7 @@
-# Even though we run everything inside docker Travis require
-# us to pick a language else it will pick Ruby by default
-# Choose a lightweight base image; we provide our own build tools.
-# https://github.com/lukasmartinelli/hadolint/blob/master/.travis.yml#L1
-# language: generic was failing in OSX so in that case you can use language: c
+# Even though we run everything inside docker,
+# Travis requires us to pick a language else it will pick Ruby by default.
+# Let's choose a lightweight base image then we provide our own build tools.
+# Note: `language: generic` was failing in OSX so in that case you can use language: c
 language: generic
 
 # Omit running tests on temporal branches,
@@ -28,7 +27,6 @@ matrix:
         - docker
       env:
         - DOCKER_VERSION="stable"
-          DOCKER_COMPOSE_VERSION="1.14.0"
           DOCKER_PUSH=true
           DOCKER_PUSH_LATEST=true
 

test/before_install_docker_compose

@@ -17,19 +17,4 @@ fi
 docker --version || (echo "FATAL: No docker installed" && exit 1)
 
 # Docker Compose
-if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
-  echo "OSX should already have docker-compose installed at this point"
-else
-  docker-compose --version || echo "INFO: No docker compose installed yet"
-  sudo -E bash -c './test/before_install_docker_compose'
-fi
 docker-compose --version || (echo "FATAL: No docker compose installed" && exit 1)
-
-# Git latest stable to avoid hang on `git merge travis-${TRAVIS_TAG}`
-# sudo add-apt-repository -y ppa:git-core/ppa
-# sudo apt-get -qyy update
-# sudo apt-get -qyy install git
-# git --version #=> 2.9.2
-
-# Notes:
-#  sudo -E or --preserve-env will preserve travis env vars like DOCKER_COMPOSE_VERSION