maverick/desktop-environment
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/desktop-environment.git synced 2026-07-30 18:16:42 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

github username

Browse source
This commit is contained in:
Jackson Delahunt 2020-10-22 10:31:59 +11:00
parent 6027905145
commit 8ef272acc2
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker/Dockerfile
View file

@ -2,6 +2,7 @@ FROM ubuntu:19.04
ARG DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD
ARG DESKTOP_ENVIRONMENT_USER
ARG DESKTOP_ENVIRONMENT_GITHUB_USER
ENV DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD ${DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD:-'$6$7De0aW9hUvGDKZmc$qrylcFmwKAL9iGNG9dvQ/GXCM4gLY.hES/P2d/3ZzRxkVMjD77WeTVSxV1P9XtmE9iAUmDwDTCHiVK.p5Ct1y1:18193:0:99999:7:::'}
ENV DISPLAY :1
@ -431,7 +432,7 @@ ARG DOTFILES_CACHEBUST
RUN DOTFILES_CACHEBUST=$DOTFILES_CACHEBUST echo "Building from dotfiles..."
# Clone user dotfiles
RUN vcsh clone https://github.com/$DESKTOP_ENVIRONMENT_USER/dotfiles.git && \
RUN vcsh clone https://github.com/$DESKTOP_ENVIRONMENT_GITHUB_USER/dotfiles.git && \
$HOME/.dotfiles-bootstrap.sh
# Record container build information

2
docker/scripts/build.sh
View file

@ -5,12 +5,14 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)"
# Get host user password to apply to container user
DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD=$(sudo cat /etc/shadow | grep $DESKTOP_ENVIRONMENT_USER | cut -d: -f2)
DESKTOP_ENVIRONMENT_GITHUB_USERNAME=$(git --git-dir $REPO_ROOT/.git remote get-url origin | sed -E 's;.*github.com.(.*)/.*;\1;')
docker build \
--build-arg DESKTOP_CONTAINER_GIT_SHA=$(git --git-dir $REPO_ROOT/.git rev-parse HEAD | cut -b 1-7) \
--build-arg DESKTOP_ENVIRONMENT_CONTAINER_IMAGE_NAME="$DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_IMAGE" \
--build-arg DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD="$DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD" \
--build-arg DESKTOP_ENVIRONMENT_USER="$DESKTOP_ENVIRONMENT_USER" \
--build-arg DESKTOP_ENVIRONMENT_GITHUB_USER="$DESKTOP_ENVIRONMENT_GITHUB_USER" \
--build-arg DOTFILES_CACHEBUST=$(cat $REPO_ROOT/.dotfiles-cachebust 2>/dev/null) \
--file $REPO_ROOT/docker/Dockerfile \
--network host \