Skip to content

Commit 820697d

Browse files
committed
Updated docker installation steps to install latest docker and docker-compose tools.
1 parent 90ad228 commit 820697d

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

ci/install-docker.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#!/usr/bin/env bash
22

3+
# See: https://docs.travis-ci.com/user/docker/#using-docker-compose
4+
# See: https://docs.travis-ci.com/user/docker/#installing-a-newer-docker-version
5+
# See: https://docs.docker.com/engine/install/ubuntu/#next-steps
36
sudo apt-get clean
7+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
8+
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
49
sudo apt-get update
5-
sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
10+
sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce docker-ce-cli containerd.io docker-compose-plugin
11+
# Print docker and docker compose tool versions.
612
docker --version
7-
sudo rm /usr/local/bin/docker-compose || true
8-
curl -L https://github.com/docker/compose/releases/download/1.6.2/docker-compose-`uname -s`-`uname -m` > docker-compose
9-
chmod +x docker-compose
10-
sudo mv docker-compose /usr/local/bin
11-
docker-compose --version
13+
docker compose version

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"homepage": "https://github.com/goalgorilla/open_social_scripts",
1212
"minimum-stability": "dev",
1313
"require": {
14-
"composer/installers": "^1.0"
14+
"composer/installers": "~1.0 || ~2.0"
1515
},
1616
"extra": {
1717
"installer-name": "social"

0 commit comments

Comments
 (0)