From 5a0a739eb7b255a87fddeef2300c9275b14a9154 Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Sat, 16 Feb 2019 01:57:26 +1100 Subject: [PATCH] no-credentials --- README.md | 5 ----- scripts/bootstrap-host.sh | 3 --- scripts/clean-hard.sh | 1 + scripts/credentials.sh | 2 -- scripts/environment.sh | 6 +++--- scripts/start.sh | 3 ++- 6 files changed, 6 insertions(+), 14 deletions(-) delete mode 100755 scripts/credentials.sh diff --git a/README.md b/README.md index 9ba3bc4..40fec21 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,12 @@ My [daily driver](https://cloud.docker.com/repository/docker/sabrehagen/desktop- ## Getting Started -Use a new GitHub [Personal Access Token](https://github.com/settings/tokens/new) for [`DESKTOP_ENVIRONMENT_GITHUB_TOKEN`](scripts/credentials.sh#L2) on each device running the desktop environmment. - On a clean install of Ubuntu 18.10+ run as `root`: ```sh # Clone desktop environment git clone https://github.com/sabrehagen/desktop-environment -# Provide repository with github access -echo DESKTOP_ENVIRONMENT_GITHUB_TOKEN=... > desktop-environment/scripts/credentials.sh - # Start desktop environment desktop-environment/scripts/bootstrap-host.sh ``` diff --git a/scripts/bootstrap-host.sh b/scripts/bootstrap-host.sh index a951ebe..611fed3 100755 --- a/scripts/bootstrap-host.sh +++ b/scripts/bootstrap-host.sh @@ -89,9 +89,6 @@ usermod \ --groups docker,sudo \ $HOST_USER -# Avoid committing user credentials to the repository -git update-index --assume-unchanged $DESKTOP_ENVIRONMENT_REPOSITORY/scripts/credentials.sh - # Start the desktop environment as the host user on system start echo "@reboot $HOST_USER $DESKTOP_ENVIRONMENT_REPOSITORY/scripts/start.sh" >> /etc/crontab diff --git a/scripts/clean-hard.sh b/scripts/clean-hard.sh index 239dec7..341c670 100755 --- a/scripts/clean-hard.sh +++ b/scripts/clean-hard.sh @@ -4,6 +4,7 @@ REPO_ROOT=$(dirname $(realpath $0))/.. $REPO_ROOT/scripts/clean.sh # Remove volumes that can be recreated from scratch, but require manual configuration in app +docker volume rm DESKTOP_ENVIRONMENT_HOSTS docker volume rm DESKTOP_ENVIRONMENT_CONFIG_CHROME docker volume rm DESKTOP_ENVIRONMENT_CONFIG_CODE docker volume rm DESKTOP_ENVIRONMENT_CONFIG_GITHUB diff --git a/scripts/credentials.sh b/scripts/credentials.sh deleted file mode 100755 index d782590..0000000 --- a/scripts/credentials.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Desktop environment user github personal access token -echo DESKTOP_ENVIRONMENT_GITHUB_TOKEN= diff --git a/scripts/environment.sh b/scripts/environment.sh index 96b1c9f..a86b6d5 100755 --- a/scripts/environment.sh +++ b/scripts/environment.sh @@ -18,6 +18,9 @@ echo DESKTOP_ENVIRONMENT_REPOSITORY=/$DESKTOP_ENVIRONMENT_USER/$DESKTOP_ENVIRONM echo DESKTOP_ENVIRONMENT_HOME=$DESKTOP_ENVIRONMENT_HOME echo DESKTOP_ENVIRONMENT_REPOSITORIES=/$DESKTOP_ENVIRONMENT_USER/repositories +# Desktop environment system state volumes +echo DESKTOP_ENVIRONMENT_HOSTS=/etc/hosts + # Desktop environment application cache volumes echo DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES=$DESKTOP_ENVIRONMENT_HOME/.pki echo DESKTOP_ENVIRONMENT_CACHE_CHROME=$DESKTOP_ENVIRONMENT_HOME/.cache/google-chrome @@ -34,6 +37,3 @@ echo DESKTOP_ENVIRONMENT_CONFIG_CODE=$DESKTOP_ENVIRONMENT_HOME/.config/Code echo DESKTOP_ENVIRONMENT_CONFIG_GITHUB=$DESKTOP_ENVIRONMENT_HOME/.config/github/hub echo DESKTOP_ENVIRONMENT_CONFIG_MUSIKCUBE=$DESKTOP_ENVIRONMENT_HOME/.musikcube echo DESKTOP_ENVIRONMENT_CONFIG_ZOOM=$DESKTOP_ENVIRONMENT_HOME/.zoom - -# Export user credentials -$REPO_ROOT/scripts/credentials.sh diff --git a/scripts/start.sh b/scripts/start.sh index f3ba115..a85c049 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -53,9 +53,10 @@ docker run \ --volume DESKTOP_ENVIRONMENT_CONFIG_MUSIKCUBE:$DESKTOP_ENVIRONMENT_CONFIG_MUSIKCUBE \ --volume DESKTOP_ENVIRONMENT_CONFIG_ZOOM:$DESKTOP_ENVIRONMENT_CONFIG_ZOOM \ --volume DESKTOP_ENVIRONMENT_HOME:$DESKTOP_ENVIRONMENT_HOME \ + --volume DESKTOP_ENVIRONMENT_HOSTS:$DESKTOP_ENVIRONMENT_HOSTS \ --volume DESKTOP_ENVIRONMENT_REPOSITORIES:$DESKTOP_ENVIRONMENT_REPOSITORIES \ --workdir $DESKTOP_ENVIRONMENT_HOME \ $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest -# Wait until the container is running before proceeding +# Wait until the desktop environment container is running before proceeding until docker inspect $DESKTOP_ENVIRONMENT_CONTAINER | grep Status | grep -m 1 running >/dev/null; do sleep 1; done