Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace docker-compose with docker-compose-plugin #604

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replace docker-compose with docker-compose-plugin #604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions bbb-install-2.6.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,11 +786,6 @@ install_greenlight_v3(){
apt-get purge -y docker-compose
fi

if [ ! -x /usr/local/bin/docker-compose ]; then
curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
fi

# Preparing and checking the enviroment.
say "preparing and checking the enviroment to install/update greelight-v3..."

Expand Down Expand Up @@ -922,7 +917,12 @@ disable_nginx_site() {

install_docker() {
need_pkg apt-transport-https ca-certificates curl gnupg-agent software-properties-common openssl


# Remove Docker Compose
if dpkg -l | grep -q docker-compose; then
apt-get purge -y docker-compose
fi

# Install Docker
if ! apt-key list | grep -q Docker; then
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
Expand All @@ -938,14 +938,10 @@ install_docker() {
stable"

apt-get update
need_pkg docker-ce docker-ce-cli containerd.io
need_pkg docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
fi
if ! which docker; then err "Docker did not install"; fi

# Remove Docker Compose
if dpkg -l | grep -q docker-compose; then
apt-get purge -y docker-compose
fi
}


Expand Down