From 52711ee6242025d10d2a181b6537fd3d4603da6d Mon Sep 17 00:00:00 2001 From: Jackson Delahunt Date: Fri, 6 Nov 2020 14:08:15 +1100 Subject: [PATCH] dotfiles build from correct remote --- docker/Dockerfile | 2 +- docker/scripts/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1124279..46367d6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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 diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh index 7a3d12a..3babf41 100755 --- a/docker/scripts/build.sh +++ b/docker/scripts/build.sh @@ -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) \