From 3993c529ba7c6027d1ed833c4173c8e1ac6f6f6f Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Thu, 28 Feb 2019 09:17:40 +1100
Subject: [PATCH] start

---
 terraform/desktop-environment.tf |  6 +++++-
 terraform/scripts/start.sh       | 21 +++------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/terraform/desktop-environment.tf b/terraform/desktop-environment.tf
index d1d1b2f..991bac4 100644
--- a/terraform/desktop-environment.tf
+++ b/terraform/desktop-environment.tf
@@ -32,7 +32,7 @@ resource "google_compute_instance" "desktop-environment" {
 
   network_interface {
     access_config {
-      nat_ip = "35.201.14.140"
+        nat_ip = "${google_compute_address.static.address}"
     }
     subnetwork = "${google_compute_subnetwork.desktop-environment.name}"
   }
@@ -79,3 +79,7 @@ resource "google_compute_network" "desktop-environment" {
   auto_create_subnetworks = false
   name = "${local.environment_name}"
 }
+
+resource "google_compute_address" "static" {
+  name = "cloud-jacksondelahunt-com"
+}
diff --git a/terraform/scripts/start.sh b/terraform/scripts/start.sh
index e70644e..c5b82fb 100755
--- a/terraform/scripts/start.sh
+++ b/terraform/scripts/start.sh
@@ -1,24 +1,9 @@
 REPO_ROOT=$(dirname $(readlink -f $0))/../..
 
-# Export desktop environment shell configuration
-export $($REPO_ROOT/docker/scripts/environment.sh)
-
-# Authenticate with cloud service provider
-$REPO_ROOT/credentials/authenticate.sh
-
-docker run \
-  --entrypoint ash \
-  --env GOOGLE_APPLICATION_CREDENTIALS=$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY/credentials/credentials.json \
-  --interactive \
-  --rm \
-  --tty \
-  --volume DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY:$DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY \
-  hashicorp/terraform:light -c "\
-  cd $DESKTOP_ENVIRONMENT_DOCKER_REPOSITORY/terraform && \
-  terraform init && \
-  terraform apply \
+# Destroy the desktop environment cloud virtual machine
+$REPO_ROOT/terraform/scripts/terraform.sh apply \
   -auto-approve \
   -var DESKTOP_ENVIRONMENT_CONTAINER=$DESKTOP_ENVIRONMENT_CONTAINER \
   -var DESKTOP_ENVIRONMENT_REGISTRY=$DESKTOP_ENVIRONMENT_REGISTRY \
   -var owner_host=$(hostname) \
-  -var owner_name=$(whoami)"
+  -var owner_name=$(whoami)