From f72cc3481bc5788b528859695d213b8b6de66146 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Tue, 26 Feb 2019 21:37:14 +1100 Subject: [PATCH] no-root --- .gitignore | 1 + host/bootstrap.sh | 4 ++-- terraform/desktop-environment.tf | 6 ------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 14de775..99a6da5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ credentials.json logs/ +terraform* diff --git a/host/bootstrap.sh b/host/bootstrap.sh index 10e66a3..d324dd3 100755 --- a/host/bootstrap.sh +++ b/host/bootstrap.sh @@ -133,7 +133,7 @@ $REPO_ROOT/docker/scripts/take-ownership.sh # Start the environment on host startup if [ "$1" = "--xpra" ]; then - echo "@reboot root $DESKTOP_ENVIRONMENT_HOST_REPOSITORY/docker/scripts/recycle-xpra.sh" >> /etc/crontab + echo "@reboot $DESKTOP_ENVIRONMENT_HOST_REPOSITORY/docker/scripts/recycle-xpra.sh" >> /etc/crontab else - echo "@reboot root $DESKTOP_ENVIRONMENT_HOST_REPOSITORY/docker/scripts/recycle.sh" >> /etc/crontab + echo "@reboot $DESKTOP_ENVIRONMENT_HOST_REPOSITORY/docker/scripts/recycle.sh" >> /etc/crontab fi diff --git a/terraform/desktop-environment.tf b/terraform/desktop-environment.tf index d247d63..4fdab73 100644 --- a/terraform/desktop-environment.tf +++ b/terraform/desktop-environment.tf @@ -1,9 +1,3 @@ -terraform { - backend "gcs" { - bucket = "${var.DESKTOP_ENVIRONMENT_REGISTRY}-${var.DESKTOP_ENVIRONMENT_CONTAINER}" - } -} - provider "google" { project = "${var.gcp_project}" }