From 90abb640d591b40a8c6d676569cb7dead6bbc156 Mon Sep 17 00:00:00 2001 From: Vadim Bauer Date: Tue, 7 Nov 2017 22:38:30 +0100 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 53b9984..414515d 100644 --- a/README.md +++ b/README.md @@ -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 From 0dcc5dfa09db8aa70ecae04b9ee1c693461d34fc Mon Sep 17 00:00:00 2001 From: Vadim Bauer Date: Mon, 13 Nov 2017 12:31:18 +0100 Subject: [PATCH 2/2] user ubuntu is only on AWS, skip step on SCW The user ubuntu does only exist on AWS, so skip adding the user ubuntu to the docker group. --- files/docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/docker.sh b/files/docker.sh index 8d13760..a7b4e5f 100755 --- a/files/docker.sh +++ b/files/docker.sh @@ -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