This commit is contained in:
Jackson Delahunt 2019-02-16 02:09:49 +11:00
parent 635348a1ca
commit fde1ac8a22
3 changed files with 2 additions and 7 deletions

View file

@ -4,7 +4,6 @@ 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

@ -18,9 +18,6 @@ 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

View file

@ -7,15 +7,15 @@ export $($REPO_ROOT/scripts/environment.sh)
$REPO_ROOT/scripts/bootstrap-volumes.sh
docker run \
--cap-add=SYS_PTRACE \
--cap-add SYS_PTRACE \
--detach \
--device /dev/dri \
--device /dev/snd \
--device /dev/usb \
--device /dev/video0 \
--device /dev/bus/usb \
--env DISPLAY=${DISPLAY-:0} \
--env DBUS_SESSION_BUS_ADDRESS \
--env DISPLAY=${DISPLAY-:0} \
--env XAUTHORITY \
--group-add audio \
--group-add docker \
@ -53,7 +53,6 @@ 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