no-credentials

This commit is contained in:
Jackson Delahunt 2019-02-16 01:57:26 +11:00
parent c2104e5b84
commit 5a0a739eb7
6 changed files with 6 additions and 14 deletions

View file

@ -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
```

View file

@ -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

View file

@ -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

View file

@ -1,2 +0,0 @@
# Desktop environment user github personal access token
echo DESKTOP_ENVIRONMENT_GITHUB_TOKEN=

View file

@ -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

View file

@ -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