maverick/desktop-environment
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/desktop-environment.git synced 2026-07-26 06:37:21 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

dotfiles build from correct remote

Browse source
This commit is contained in:
Jackson Delahunt 2020-11-06 14:08:15 +11:00
parent 9143a3dc1e
commit 52711ee624
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/Dockerfile
View file

@ -430,7 +430,7 @@ ARG DOTFILES_CACHEBUST
RUN DOTFILES_CACHEBUST=$DOTFILES_CACHEBUST echo "Building from dotfiles..."
# Clone user dotfiles or fallback to sabrehagen dotfiles
RUN git ls-remote git@github.com:$DESKTOP_ENVIRONMENT_GITHUB_USER/dotfiles.git && vcsh clone https://github.com/$DESKTOP_ENVIRONMENT_USER/dotfiles.git || \
RUN vcsh clone git://github.com/$DESKTOP_ENVIRONMENT_USER/dotfiles.git || \
vcsh clone https://github.com/sabrehagen/dotfiles.git
# Bootstrap dotfiles

2
docker/scripts/build.sh
View file

@ -5,7 +5,7 @@ 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;')
DESKTOP_ENVIRONMENT_GITHUB_USER=$(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) \