This commit is contained in:
Jackson Delahunt 2019-02-14 20:47:00 +11:00
parent 3acbf52085
commit d80ac5e1f7
3 changed files with 4 additions and 8 deletions

View file

@ -66,6 +66,9 @@ ENV BASE_USER stemn
ENV USER jackson
ENV HOME /$USER/home
# System environment configuration
SSH_AUTH_SOCK $HOME/.ssh.sock
# User specific configuration
ENV STEMN_GIT_EMAIL "jackson@stemn.com"
ENV STEMN_GIT_NAME "Jackson Delahunt"
@ -107,8 +110,6 @@ RUN cp /$BASE_USER/home/.zshrc $HOME
# Remove base user files
RUN rm -rf $BASE_USER
ARG DESKTOP_ENVIRONMENT_GITHUB_TOKEN
# Clone dotfiles configuration
RUN alias https-to-git="sed 's;https://github.com/\(.*\);git@github.com:\1.git;'"
RUN vcsh clone https://github.com/sabrehagen/dotfiles-alacritty && \
@ -116,8 +117,6 @@ RUN vcsh clone https://github.com/sabrehagen/dotfiles-alacritty && \
vcsh clone https://github.com/sabrehagen/dotfiles-code && \
vcsh clone https://github.com/sabrehagen/dotfiles-musikcube && \
vcsh clone https://github.com/sabrehagen/dotfiles-scripts && \
vcsh clone https://${DESKTOP_ENVIRONMENT_GITHUB_TOKEN}@github.com/sabrehagen/dotfiles-ssh && \
vcsh clone https://${DESKTOP_ENVIRONMENT_GITHUB_TOKEN}@github.com/sabrehagen/dotfiles-stemn && \
vcsh clone https://github.com/sabrehagen/dotfiles-vlc && \
vcsh clone https://github.com/sabrehagen/dotfiles-zsh

View file

@ -6,6 +6,5 @@ export $(sh $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) \
--build-arg DESKTOP_ENVIRONMENT_GITHUB_TOKEN \
--tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER:latest \
$REPO_ROOT

View file

@ -15,8 +15,6 @@ docker run \
--device /dev/bus/usb \
--env DISPLAY \
--env SSH_AUTH_SOCK=$DESKTOP_ENVIRONMENT_HOME/.ssh.sock \
--env STEMN_GIT_EMAIL="jackson@stemn.com" \
--env STEMN_GIT_NAME="Jackson Delahunt" \
--group-add audio \
--group-add video \
--interactive \
@ -33,12 +31,12 @@ docker run \
--volume $HOME/.config/alacritty:$DESKTOP_ENVIRONMENT_HOME/.config/alacritty \
--volume $HOME/.pki:$DESKTOP_ENVIRONMENT_HOME/.pki \
--volume $HOME/.ssh:$DESKTOP_ENVIRONMENT_HOME/.ssh \
--volume $HOME/notes:$DESKTOP_ENVIRONMENT_HOME/notes \
--volume $HOME/Documents:$DESKTOP_ENVIRONMENT_HOME/Documents \
--volume $HOME/Downloads:$DESKTOP_ENVIRONMENT_HOME/Downloads \
--volume $HOME/Music:$DESKTOP_ENVIRONMENT_HOME/Music \
--volume $HOME/Pictures:$DESKTOP_ENVIRONMENT_HOME/Pictures \
--volume $HOME/Videos:$DESKTOP_ENVIRONMENT_HOME/Videos \
--volume $HOME/notes:$DESKTOP_ENVIRONMENT_HOME/notes \
--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 \