diff --git a/ci/install-docker.sh b/ci/install-docker.sh index f6ced62..18427e6 100644 --- a/ci/install-docker.sh +++ b/ci/install-docker.sh @@ -1,11 +1,13 @@ #!/usr/bin/env bash +# See: https://docs.travis-ci.com/user/docker/#using-docker-compose +# See: https://docs.travis-ci.com/user/docker/#installing-a-newer-docker-version +# See: https://docs.docker.com/engine/install/ubuntu/#next-steps sudo apt-get clean +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" sudo apt-get update -sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce +sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce docker-ce-cli containerd.io docker-compose-plugin +# Print docker and docker compose tool versions. docker --version -sudo rm /usr/local/bin/docker-compose || true -curl -L https://github.com/docker/compose/releases/download/1.6.2/docker-compose-`uname -s`-`uname -m` > docker-compose -chmod +x docker-compose -sudo mv docker-compose /usr/local/bin -docker-compose --version +docker compose version diff --git a/composer.json b/composer.json index b22c6b5..ded09f0 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "homepage": "https://github.com/goalgorilla/open_social_scripts", "minimum-stability": "dev", "require": { - "composer/installers": "^1.0" + "composer/installers": "~1.0 || ~2.0" }, "extra": { "installer-name": "social"