Skip to content

Commit

Permalink
Updated docker installation steps to install latest docker and docker…
Browse files Browse the repository at this point in the history
…-compose tools.
  • Loading branch information
navneet0693 committed Jun 7, 2022
1 parent 90ad228 commit 820697d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 8 additions & 6 deletions ci/install-docker.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 820697d

Please sign in to comment.