Skip to content

Use docker subcommand "compose" instead of requiring separate docker-compose binaries #6

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

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

Use docker subcommand "compose" instead of requiring separate docker-compose binaries #6

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions control-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

function stop {
echo "Stopping and removing containers"
docker-compose --project-name wksp down
docker compose --project-name wksp down
}

function cleanup {
Expand All @@ -14,15 +14,15 @@ function cleanup {

function start {
echo "Starting up"
docker-compose --project-name wksp up -d
docker compose --project-name wksp up -d
}

function update {
echo "Updating code ..."
git pull --all

echo "Updating docker images ..."
docker-compose --project-name wksp pull
docker compose --project-name wksp pull

echo "You probably should restart"
}
Expand Down Expand Up @@ -78,7 +78,7 @@ case $1 in
;;

logs )
docker-compose --project-name wksp logs -f
docker compose --project-name wksp logs -f
;;

token )
Expand All @@ -88,7 +88,7 @@ case $1 in
superset-start )
superset-start
;;

superset-stop )
superset-stop
;;
Expand Down
4 changes: 0 additions & 4 deletions vm/install-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ sudo usermod -aG docker "${USER}"

sudo systemctl enable docker

# Docker Compose
sudo curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose

# Cleanup
sudo apt-get -y autoremove

Expand Down
10 changes: 3 additions & 7 deletions vm/install-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ sudo apt-get install -y git \
maven

## Scala
# IMPORTANT: Make sure scala version is the same as Spark
# IMPORTANT: Make sure scala version is the same as Spark
# have been compiled to. Run spark-shell
#
#
sudo apt-get -y remove --auto-remove scala-library scala
sudo apt-get -y purge scala-library* scala*

Expand Down Expand Up @@ -56,10 +56,6 @@ sudo apt-get install -y docker-ce
sudo groupadd docker
sudo usermod -aG docker "${USER}"

# Docker Compose
sudo curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose

# Cleanup
sudo apt-get -y autoremove

Expand All @@ -71,4 +67,4 @@ cd ~
git clone https://github.com/arjones/bigdata-workshop-es.git

cd bigdata-workshop-es
docker-compose pull
docker compose pull