This commit is contained in:
Jackson Delahunt 2019-01-18 16:33:14 +11:00
parent f723cc0ec9
commit 4ea2a8fc5b
5 changed files with 36 additions and 21 deletions

View file

@ -24,6 +24,13 @@ RUN usermod \
--login $USER \
$BASE_USER
# Install user utilities
RUN apt install --yes \
software-properties-common \
vcsh \
vlc \
xinput
# Install chrome
RUN apt update && apt install --yes \
apt-transport-https \
@ -63,11 +70,6 @@ RUN wget -O rescuetime.deb -nv https://www.rescuetime.com/installers/rescuetime_
dpkg -i rescuetime.deb || apt --fix-broken --yes install && \
rm rescuetime.deb
# Install user utilities
RUN apt install --yes \
vcsh \
xinput
# Enable password-less sudo for user
RUN echo "$USER ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
@ -95,7 +97,8 @@ RUN zsh -c "cp -r /$BASE_USER/home/{.gitconfig,.motd,.tmux.conf,.zshenv,.zshrc}
RUN alias https-to-git="sed 's;https://github.com/\(.*\);git@github.com:\1.git;'"
RUN vcsh clone https://github.com/sabrehagen/dotfiles-alacritty && \
vcsh clone https://github.com/sabrehagen/dotfiles-code && \
vcsh clone https://github.com/sabrehagen/dotfiles-scripts
vcsh clone https://github.com/sabrehagen/dotfiles-scripts && \
vcsh clone https://github.com/sabrehagen/dotfiles-vlc
# Add program configurations
COPY config/tmuxinator $HOME/.config/tmuxinator

View file

@ -36,7 +36,8 @@ xhost local:docker
# Install utilities
apt update && apt install --yes && \
docker.io && \
docker.io \
ksshaskpass \
vcsh
# Enable password-less sudo for the host user

View file

@ -3,28 +3,36 @@ REPO_ROOT=$(dirname $(realpath $0))/..
# Export development environment shell configuration
export $(sh $REPO_ROOT/scripts/environment.sh)
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_YARN volume
docker run \
--rm \
--user root \
--volume DESKTOP_ENVIRONMENT_CACHE_YARN:$DESKTOP_ENVIRONMENT_CACHE_YARN \
sabrehagen/desktop-environment:latest \
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_YARN
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_CHROME volume
docker run \
--rm \
--user root \
--volume DESKTOP_ENVIRONMENT_CACHE_CHROME:$DESKTOP_ENVIRONMENT_CACHE_CHROME \
sabrehagen/desktop-environment:latest \
$DESKTOP_ENVIRONMENT_USER/desktop-environment:latest \
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_CHROME
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_YARN volume
docker run \
--rm \
--user root \
--volume DESKTOP_ENVIRONMENT_CACHE_YARN:$DESKTOP_ENVIRONMENT_CACHE_YARN \
$DESKTOP_ENVIRONMENT_USER/desktop-environment:latest \
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_YARN
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CACHE_ZSH volume
docker run \
--rm \
--user root \
--volume DESKTOP_ENVIRONMENT_CACHE_ZSH:$DESKTOP_ENVIRONMENT_CACHE_ZSH \
$DESKTOP_ENVIRONMENT_USER/desktop-environment:latest \
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CACHE_ZSH
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CONFIG_CHROME volume
docker run \
--rm \
--user root \
--volume DESKTOP_ENVIRONMENT_CONFIG_CHROME:$DESKTOP_ENVIRONMENT_CONFIG_CHROME \
sabrehagen/desktop-environment:latest \
$DESKTOP_ENVIRONMENT_USER/desktop-environment:latest \
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CONFIG_CHROME
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CONFIG_CODE volume
@ -32,7 +40,7 @@ docker run \
--rm \
--user root \
--volume DESKTOP_ENVIRONMENT_CONFIG_CODE:$DESKTOP_ENVIRONMENT_CONFIG_CODE \
sabrehagen/desktop-environment:latest \
$DESKTOP_ENVIRONMENT_USER/desktop-environment:latest \
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CONFIG_CODE
# Give the container user ownership of the DESKTOP_ENVIRONMENT_CONFIG_GITHUB volume
@ -40,5 +48,5 @@ docker run \
--rm \
--user root \
--volume DESKTOP_ENVIRONMENT_CONFIG_GITHUB:$DESKTOP_ENVIRONMENT_CONFIG_GITHUB \
sabrehagen/desktop-environment:latest \
$DESKTOP_ENVIRONMENT_USER/desktop-environment:latest \
chown -R $DESKTOP_ENVIRONMENT_USER:$DESKTOP_ENVIRONMENT_USER $DESKTOP_ENVIRONMENT_CONFIG_GITHUB

View file

@ -1,7 +1,10 @@
REPO_ROOT=$(dirname $(realpath $0))/..
# Export development environment shell configuration
export $(sh $REPO_ROOT/scripts/environment.sh)
docker build \
--build-arg CONTAINER_BUILD_DATE=$(date +%s) \
--build-arg CONTAINER_GIT_SHA=$(git rev-parse HEAD | cut -b 1-7) \
--tag sabrehagen/desktop-environment:latest \
--tag $DESKTOP_ENVIRONMENT_USER/desktop-environment:latest \
$REPO_ROOT

View file

@ -47,7 +47,7 @@ docker run \
--volume DESKTOP_ENVIRONMENT_CONFIG_GITHUB:$DESKTOP_ENVIRONMENT_CONFIG_GITHUB \
--volume DESKTOP_ENVIRONMENT_HOME:$DESKTOP_ENVIRONMENT_HOME \
--workdir $DESKTOP_ENVIRONMENT_HOME \
sabrehagen/desktop-environment:latest
$DESKTOP_ENVIRONMENT_REGISTRY/desktop-environment:latest
# Wait until the container is running before proceeding
until docker inspect desktop-environment | grep Status | grep -m 1 running >/dev/null; do sleep 1; done