mirror of
https://github.com/kingomarnajjar/desktop-environment.git
synced 2026-07-26 06:37:21 +10:00
paths
This commit is contained in:
parent
9bbed7ab42
commit
62073c6f16
7 changed files with 81 additions and 67 deletions
|
|
@ -2,7 +2,8 @@ FROM stemn/development-environment:latest
|
|||
USER root
|
||||
|
||||
# Install user utilities
|
||||
RUN apt-get update -qq && apt-get install -qq --fix-broken \
|
||||
RUN apt-get update -qq && \
|
||||
apt-get install -qq --fix-broken \
|
||||
alpine \
|
||||
alsa-utils \
|
||||
arandr \
|
||||
|
|
@ -71,9 +72,6 @@ RUN yarn global add \
|
|||
# System environment configuration
|
||||
ENV S6_LOGGING 1
|
||||
|
||||
# SSH daemon config
|
||||
RUN echo 'ListenAddress 0.0.0.0\nPort 22' > /etc/ssh/sshd_config
|
||||
|
||||
# Container user home directories
|
||||
ENV BASE_USER stemn
|
||||
ENV USER jackson
|
||||
|
|
@ -109,7 +107,7 @@ RUN usermod \
|
|||
# Add user configuration files
|
||||
COPY .motd $HOME
|
||||
|
||||
# Remove remaining base user files
|
||||
# Remove base user files
|
||||
RUN rm -rf /$BASE_USER
|
||||
|
||||
# Take ownership of the desktop user's folder
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ docker run \
|
|||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES:$DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_CHROME volume
|
||||
|
|
@ -16,7 +16,7 @@ docker run \
|
|||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_CHROME:$DESKTOP_ENVIRONMENT_CACHE_CHROME \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_CHROME &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_CODE volume
|
||||
|
|
@ -24,23 +24,23 @@ docker run \
|
|||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_CODE:$DESKTOP_ENVIRONMENT_CACHE_CODE \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_CODE &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_JUMP volume
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_SECRETS volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_JUMP:$DESKTOP_ENVIRONMENT_CACHE_JUMP \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_JUMP &
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_SECRETS:$DESKTOP_ENVIRONMENT_CACHE_SECRETS \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_SECRETS &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_SSH volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_SSH:$DESKTOP_ENVIRONMENT_CACHE_SSH \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_SSH &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_STEMN volume
|
||||
|
|
@ -48,7 +48,7 @@ docker run \
|
|||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_STEMN:$DESKTOP_ENVIRONMENT_CACHE_STEMN \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_STEMN &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_YARN volume
|
||||
|
|
@ -56,7 +56,7 @@ docker run \
|
|||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_YARN:$DESKTOP_ENVIRONMENT_CACHE_YARN \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_YARN &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_ZOOM volume
|
||||
|
|
@ -64,7 +64,7 @@ docker run \
|
|||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_ZOOM:$DESKTOP_ENVIRONMENT_CACHE_ZOOM \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_ZOOM &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_ZSH volume
|
||||
|
|
@ -72,56 +72,72 @@ docker run \
|
|||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_ZSH:$DESKTOP_ENVIRONMENT_CACHE_ZSH \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_ZSH &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CONFIG_CHROME volume
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_STATE_CHROME volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CONFIG_CHROME:$DESKTOP_ENVIRONMENT_CONFIG_CHROME \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CONFIG_CHROME &
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_CHROME:$DESKTOP_ENVIRONMENT_STATE_CHROME \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_STATE_CHROME &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CONFIG_CODE volume
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_STATE_CODE volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CONFIG_CODE:$DESKTOP_ENVIRONMENT_CONFIG_CODE \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CONFIG_CODE &
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_CODE:$DESKTOP_ENVIRONMENT_STATE_CODE \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_STATE_CODE &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CONFIG_GITHUB volume
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_STATE_GITHUB volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CONFIG_GITHUB:$DESKTOP_ENVIRONMENT_CONFIG_GITHUB \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CONFIG_GITHUB &
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_GITHUB:$DESKTOP_ENVIRONMENT_STATE_GITHUB \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_STATE_GITHUB &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CONFIG_MUSIKCUBE volume
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_STATE_JUMP volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CONFIG_MUSIKCUBE:$DESKTOP_ENVIRONMENT_CONFIG_MUSIKCUBE \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CONFIG_MUSIKCUBE &
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_JUMP:$DESKTOP_ENVIRONMENT_STATE_JUMP \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_STATE_JUMP &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CONFIG_ZOOM volume
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_CONFIG_ZOOM:$DESKTOP_ENVIRONMENT_CONFIG_ZOOM \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CONFIG_ZOOM &
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE:$DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_REPOSITORIES volume
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_STATE_VCSH volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_REPOSITORIES:$DESKTOP_ENVIRONMENT_REPOSITORIES \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_REPOSITORIES &
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_VCSH:$DESKTOP_ENVIRONMENT_STATE_VCSH \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_STATE_VCSH &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_STATE_ZOOM volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_ZOOM:$DESKTOP_ENVIRONMENT_STATE_ZOOM \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_STATE_ZOOM &
|
||||
|
||||
# Give the container user ownership of the DESKTOP_ENVIRONMENT_USER_REPOSITORIES volume
|
||||
docker run \
|
||||
--rm \
|
||||
--user root \
|
||||
--volume DESKTOP_ENVIRONMENT_USER_REPOSITORIES:$DESKTOP_ENVIRONMENT_USER_REPOSITORIES \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_USER_REPOSITORIES &
|
||||
|
||||
# Wait for ownership changes to complete in parallel
|
||||
wait
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ export $($REPO_ROOT/scripts/environment.sh)
|
|||
docker build \
|
||||
--build-arg DESKTOP_CONTAINER_BUILD_DATE=$(date +%s) \
|
||||
--build-arg DESKTOP_CONTAINER_GIT_SHA=$(git --git-dir $REPO_ROOT/.git rev-parse HEAD | cut -b 1-7) \
|
||||
--tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
|
||||
--tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH \
|
||||
$REPO_ROOT
|
||||
|
|
|
|||
|
|
@ -4,7 +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_CONFIG_CHROME
|
||||
docker volume rm DESKTOP_ENVIRONMENT_CONFIG_CODE
|
||||
docker volume rm DESKTOP_ENVIRONMENT_CONFIG_GITHUB
|
||||
docker volume rm DESKTOP_ENVIRONMENT_CONFIG_ZOOM
|
||||
docker volume rm DESKTOP_ENVIRONMENT_STATE_CHROME
|
||||
docker volume rm DESKTOP_ENVIRONMENT_STATE_CODE
|
||||
docker volume rm DESKTOP_ENVIRONMENT_STATE_GITHUB
|
||||
docker volume rm DESKTOP_ENVIRONMENT_STATE_ZOOM
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
REPO_ROOT=$(dirname $(realpath $0))/..
|
||||
GIT_BRANCH=$(git --git-dir $REPO_ROOT/.git rev-parse --abbrev-ref HEAD)
|
||||
|
||||
# Desktop environment container user
|
||||
DESKTOP_ENVIRONMENT_USER=jackson
|
||||
|
|
@ -16,22 +17,22 @@ echo DESKTOP_ENVIRONMENT_REPOSITORY=/$DESKTOP_ENVIRONMENT_USER/$DESKTOP_ENVIRONM
|
|||
echo DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES=$DESKTOP_ENVIRONMENT_HOME/.pki
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_CHROME=$DESKTOP_ENVIRONMENT_HOME/.cache/google-chrome
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_CODE=$DESKTOP_ENVIRONMENT_HOME/.vscode
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_JUMP=$DESKTOP_ENVIRONMENT_HOME/.jump
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_SECRETS=$DESKTOP_ENVIRONMENT_HOME/.secrets
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_SSH=$DESKTOP_ENVIRONMENT_HOME/.ssh
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_STEMN=$DESKTOP_ENVIRONMENT_HOME/.stemn
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_SECRETS=$DESKTOP_ENVIRONMENT_HOME/.secrets
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_VCSH=$DESKTOP_ENVIRONMENT_HOME/.config/vcsh/repo.d
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_YARN=$DESKTOP_ENVIRONMENT_HOME/.cache/yarn
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_ZOOM=$DESKTOP_ENVIRONMENT_HOME/.cache/zoom
|
||||
echo DESKTOP_ENVIRONMENT_CACHE_ZSH=$DESKTOP_ENVIRONMENT_HOME/.cache/zsh
|
||||
|
||||
# Desktop environment application configuration volumes
|
||||
echo DESKTOP_ENVIRONMENT_CONFIG_CHROME=$DESKTOP_ENVIRONMENT_HOME/.config/google-chrome
|
||||
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
|
||||
echo DESKTOP_ENVIRONMENT_STATE_CHROME=$DESKTOP_ENVIRONMENT_HOME/.config/google-chrome
|
||||
echo DESKTOP_ENVIRONMENT_STATE_CODE=$DESKTOP_ENVIRONMENT_HOME/.config/Code
|
||||
echo DESKTOP_ENVIRONMENT_STATE_GITHUB=$DESKTOP_ENVIRONMENT_HOME/.config/github/hub
|
||||
echo DESKTOP_ENVIRONMENT_STATE_JUMP=$DESKTOP_ENVIRONMENT_HOME/.jump
|
||||
echo DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE=$DESKTOP_ENVIRONMENT_HOME/.musikcube
|
||||
echo DESKTOP_ENVIRONMENT_STATE_VCSH=$DESKTOP_ENVIRONMENT_HOME/.config/vcsh
|
||||
echo DESKTOP_ENVIRONMENT_STATE_ZOOM=$DESKTOP_ENVIRONMENT_HOME/.zoom
|
||||
|
||||
# Desktop environment user state volumes
|
||||
echo DESKTOP_ENVIRONMENT_HOME=$DESKTOP_ENVIRONMENT_HOME
|
||||
echo DESKTOP_ENVIRONMENT_REPOSITORIES=/$DESKTOP_ENVIRONMENT_USER/repositories
|
||||
echo DESKTOP_ENVIRONMENT_USER_HOME=$DESKTOP_ENVIRONMENT_HOME
|
||||
echo DESKTOP_ENVIRONMENT_USER_REPOSITORIES=/$DESKTOP_ENVIRONMENT_USER/repositories
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ REPO_ROOT=$(dirname $(realpath $0))/..
|
|||
# Export desktop environment shell configuration
|
||||
export $($REPO_ROOT/scripts/environment.sh)
|
||||
|
||||
docker push $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest
|
||||
docker push $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ export $($REPO_ROOT/scripts/environment.sh)
|
|||
docker run \
|
||||
--cap-add SYS_PTRACE \
|
||||
--detach \
|
||||
--device /dev/bus/usb \
|
||||
--device /dev/dri \
|
||||
--device /dev/snd \
|
||||
--device /dev/usb \
|
||||
--device /dev/video0 \
|
||||
--device /dev/bus/usb \
|
||||
--env DISPLAY=${DISPLAY-:0} \
|
||||
--group-add audio \
|
||||
--group-add docker \
|
||||
|
|
@ -18,7 +18,6 @@ docker run \
|
|||
--hostname $DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_CONTAINER-$(hostname) \
|
||||
--interactive \
|
||||
--name $DESKTOP_ENVIRONMENT_CONTAINER \
|
||||
--publish 22 \
|
||||
--rm \
|
||||
--security-opt seccomp:$REPO_ROOT/config/chrome/chrome.json \
|
||||
--tty \
|
||||
|
|
@ -37,22 +36,22 @@ docker run \
|
|||
--volume DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES:$DESKTOP_ENVIRONMENT_CACHE_CERTIFICATES \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_CHROME:$DESKTOP_ENVIRONMENT_CACHE_CHROME \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_CODE:$DESKTOP_ENVIRONMENT_CACHE_CODE \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_JUMP:$DESKTOP_ENVIRONMENT_CACHE_JUMP \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_SECRETS:$DESKTOP_ENVIRONMENT_CACHE_SECRETS \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_SSH:$DESKTOP_ENVIRONMENT_CACHE_SSH \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_STEMN:$DESKTOP_ENVIRONMENT_CACHE_STEMN \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_YARN:$DESKTOP_ENVIRONMENT_CACHE_YARN \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_ZOOM:$DESKTOP_ENVIRONMENT_CACHE_ZOOM \
|
||||
--volume DESKTOP_ENVIRONMENT_CACHE_ZSH:$DESKTOP_ENVIRONMENT_CACHE_ZSH \
|
||||
--volume DESKTOP_ENVIRONMENT_CONFIG_CHROME:$DESKTOP_ENVIRONMENT_CONFIG_CHROME \
|
||||
--volume DESKTOP_ENVIRONMENT_CONFIG_CODE:$DESKTOP_ENVIRONMENT_CONFIG_CODE \
|
||||
--volume DESKTOP_ENVIRONMENT_CONFIG_GITHUB:$DESKTOP_ENVIRONMENT_CONFIG_GITHUB \
|
||||
--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_REPOSITORIES:$DESKTOP_ENVIRONMENT_REPOSITORIES \
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_CHROME:$DESKTOP_ENVIRONMENT_STATE_CHROME \
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_CODE:$DESKTOP_ENVIRONMENT_STATE_CODE \
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_GITHUB:$DESKTOP_ENVIRONMENT_STATE_GITHUB \
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_JUMP:$DESKTOP_ENVIRONMENT_STATE_JUMP \
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE:$DESKTOP_ENVIRONMENT_STATE_MUSIKCUBE \
|
||||
--volume DESKTOP_ENVIRONMENT_STATE_ZOOM:$DESKTOP_ENVIRONMENT_STATE_ZOOM \
|
||||
--volume DESKTOP_ENVIRONMENT_USER_REPOSITORIES:$DESKTOP_ENVIRONMENT_USER_REPOSITORIES \
|
||||
--workdir $DESKTOP_ENVIRONMENT_HOME \
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest
|
||||
$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:$GIT_BRANCH
|
||||
|
||||
# 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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue