From 2b46c0f4aa100e900e83185a6313782718bb3d91 Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Fri, 10 Jan 2020 20:57:06 +1100
Subject: [PATCH] github-actor

---
 .github/workflows/build-and-publish.yml |  3 ++-
 docker/Dockerfile                       | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index ad9fdea..0fd1ca7 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -9,9 +9,10 @@ jobs:
       uses: elgohr/Publish-Docker-Github-Action@master
       env:
         DESKTOP_ENVIRONMENT_USER: ${{ secrets.DESKTOP_ENVIRONMENT_USER }}
+        DESKTOP_ENVIRONMENT_REGISTRY: $GITHUB_ACTOR
       with:
         dockerfile: docker/Dockerfile
         name: ${{ secrets.DESKTOP_ENVIRONMENT_REGISTRY }}/desktop-environment:latest
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-        buildargs: DESKTOP_ENVIRONMENT_USER
+        buildargs: DESKTOP_ENVIRONMENT_USER,DESKTOP_ENVIRONMENT_REGISTRY
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 42a186a..7954380 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,20 +4,21 @@ ARG DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD
 ARG DESKTOP_ENVIRONMENT_REGISTRY
 ARG DESKTOP_ENVIRONMENT_USER
 
-ENV USER $DESKTOP_ENVIRONMENT_REGISTRY
-ENV USER $DESKTOP_ENVIRONMENT_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 DESKTOP_ENVIRONMENT_REGISTRY $DESKTOP_ENVIRONMENT_REGISTRY
 ENV DISPLAY :1
 ENV EDITOR nano
-ENV HOME /home/$USER
 ENV LANG en_US.UTF-8
 ENV LANGUAGE $LANG
 ENV LC_ALL $LANG
 ENV LC_CTYPE $LANG
 ENV SHELL /bin/zsh
 ENV TERM xterm-256color
+ENV USER $DESKTOP_ENVIRONMENT_USER
 ENV TZ Australia/Sydney
 
+ENV HOME /home/$USER
+
 # Restore minimized distribution content e.g. man pages
 RUN yes | unminimize
 
@@ -436,8 +437,8 @@ ARG DOTFILES_CACHEBUST
 RUN DOTFILES_CACHEBUST=$DOTFILES_CACHEBUST echo "Building from dotfiles..."
 
 # Clone user dotfiles
-RUN vcsh clone git@github.com:$DESKTOP_ENVIRONMENT_REGISTRY/dotfiles && \
-  ~/.dotfiles-bootstrap.sh
+RUN vcsh clone https://$DESKTOP_ENVIRONMENT_REGISTRY@github.com/$DESKTOP_ENVIRONMENT_REGISTRY/dotfiles.git && \
+  $HOME/.dotfiles-bootstrap.sh
 
 # Record container build information
 ARG DESKTOP_CONTAINER_GIT_SHA