From 3d4f820df122de11cf06de18a4ff9508f39b7dfc Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Thu, 28 Feb 2019 08:48:20 +1100
Subject: [PATCH] credentials

---
 credentials/authenticate.sh      | 10 +++++++++-
 docker/scripts/clone.sh          |  2 +-
 host/bootstrap.sh                |  4 ++--
 terraform/desktop-environment.tf |  5 +++--
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/credentials/authenticate.sh b/credentials/authenticate.sh
index 3323c93..ea07629 100755
--- a/credentials/authenticate.sh
+++ b/credentials/authenticate.sh
@@ -1,6 +1,14 @@
 REPO_ROOT=$(dirname $(readlink -f $0))/..
 
+# Export desktop environment shell configuration
+export $($REPO_ROOT/docker/scripts/environment.sh)
+
 # Extract credentials from environment
 if [ ! -z "$DESKTOP_ENVIRONMENT_CREDENTIALS" ]; then
-  echo "$DESKTOP_ENVIRONMENT_CREDENTIALS" > $REPO_ROOT/credentials/credentials.json
+  docker run \
+    --env DESKTOP_ENVIRONMENT_CREDENTIALS \
+    --interactive \
+    --rm \
+    --volume DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY:$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY \
+    alpine:latest ash -c "echo '$DESKTOP_ENVIRONMENT_CREDENTIALS' > $DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY/credentials/credentials.json"
 fi
diff --git a/docker/scripts/clone.sh b/docker/scripts/clone.sh
index 2de7a22..92b5f56 100755
--- a/docker/scripts/clone.sh
+++ b/docker/scripts/clone.sh
@@ -7,4 +7,4 @@ docker run \
   --rm \
   --volume DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY:$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY \
   --workdir $DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY \
-  alpine/git clone https://github.com/$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER --branch $DESKTOP_ENVIRONMENT_BRANCH $DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY
+  alpine/git:latest clone https://github.com/$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER --branch $DESKTOP_ENVIRONMENT_BRANCH $DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY
diff --git a/host/bootstrap.sh b/host/bootstrap.sh
index c394c20..67c6e87 100755
--- a/host/bootstrap.sh
+++ b/host/bootstrap.sh
@@ -93,10 +93,10 @@ gosu $HOST_USER vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-til
 gosu $HOST_USER vcsh clone https://sabrehagen@github.com/sabrehagen/dotfiles-zsh.git
 
 # Pre-cache development environment container
-docker pull $DESKTOP_ENVIRONMENT_REPOSITORY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_BRANCH
+docker pull --quiet $DESKTOP_ENVIRONMENT_REPOSITORY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_BRANCH
 
 # Pre-cache development environment support container
-docker pull jare/x11-bridge:latest
+docker pull --quiet jare/x11-bridge:latest
 
 # Clone the desktop environment into a local docker volume
 $REPO_ROOT/docker/scripts/clone.sh
diff --git a/terraform/desktop-environment.tf b/terraform/desktop-environment.tf
index bf58eb7..d1d1b2f 100644
--- a/terraform/desktop-environment.tf
+++ b/terraform/desktop-environment.tf
@@ -1,7 +1,8 @@
 terraform {
   backend "gcs" {
-    bucket  = "desktop-environment"
-    prefix  = "terraform  "
+    bucket = "desktop-environment"
+    prefix = "terraform"
+    project = "${var.gcp_project}"
   }
 }