Skip to content

Commit

Permalink
Merge branch 'master' of github.com:8gears/Cloud-Workshop-VM
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vad1mo
Vad1mo committed Jan 10, 2018
2 parents 4bad2a4 + 0dcc5df commit bfcfc67
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The Primary goal of this repository is to provide an easy and reproducible way t

## How It Works

Terrafrom will order the machines on AWS and SCW, after the machines are booted, Terrafrom will also execute scripts in `./files/` on the machines that perform the customization of the machines.
With Terrafrom we order the machines on AWS or Scaleway (SCW), after the machines are booted, Terrafrom will also execute customization setup scripts.

## What Is The Result

Expand Down
4 changes: 2 additions & 2 deletions files/docker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ chmod +x /usr/local/bin/docker-compose

echo "...installing docker-compose done. Installed Version is $(docker-compose -v)"

echo "Granting user ubuntu Docker daemon access"
adduser ubuntu docker

[ -f /usr/local/bin/scw-metadata ] || echo "Granting user ubuntu Docker daemon access" && adduser ubuntu docker

0 comments on commit bfcfc67

Please sign in to comment.