From 589d4e1a324707f68dd281b5d40886a22b5bc09e Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Thu, 3 Sep 2020 11:53:12 +1000
Subject: [PATCH] first-try

---
 .github/workflows/build-and-publish.yml | 26 +++++++++++++------------
 docker/Dockerfile                       |  4 +---
 docker/scripts/build.sh                 |  1 -
 docker/scripts/environment.sh           |  4 ++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 8db6cc8..3a8854b 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -4,15 +4,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - name: Publish to Registry
-      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: ${{ github.actor }}/desktop-environment:latest
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        buildargs: DESKTOP_ENVIRONMENT_USER,DESKTOP_ENVIRONMENT_REGISTRY
+      - name: Check out repository
+        uses: actions/checkout@v2
+      - name: Push to GitHub Container Registry
+        uses: docker/build-push-action@v1
+        env:
+          DESKTOP_ENVIRONMENT_USER: ${{ github.actor }}
+        with:
+          buildargs: DESKTOP_ENVIRONMENT_USER
+          dockerfile: docker/Dockerfile
+          registry: ghcr.io/${{ github.actor }}
+          repository: desktop-environment
+          tag_with_ref: true
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 940d12a..b34c493 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,11 +1,9 @@
 FROM ubuntu:19.04
 
 ARG DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD
-ARG DESKTOP_ENVIRONMENT_REGISTRY
 ARG 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 LANG en_US.UTF-8
@@ -435,7 +433,7 @@ ARG DOTFILES_CACHEBUST
 RUN DOTFILES_CACHEBUST=$DOTFILES_CACHEBUST echo "Building from dotfiles..."
 
 # Clone user dotfiles
-RUN vcsh clone https://$DESKTOP_ENVIRONMENT_REGISTRY@github.com/$DESKTOP_ENVIRONMENT_REGISTRY/dotfiles.git && \
+RUN vcsh clone https://$DESKTOP_ENVIRONMENT_USER@github.com/$DESKTOP_ENVIRONMENT_USER/dotfiles.git && \
   $HOME/.dotfiles-bootstrap.sh
 
 # Record container build information
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 5f04e4b..4b8c137 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -9,7 +9,6 @@ DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD=$(sudo cat /etc/shadow | grep $DESKTOP_EN
 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_HOST_USER_PASSWORD="$DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD" \
-  --build-arg DESKTOP_ENVIRONMENT_REGISTRY="$DESKTOP_ENVIRONMENT_REGISTRY" \
   --build-arg DESKTOP_ENVIRONMENT_USER="$DESKTOP_ENVIRONMENT_USER" \
   --build-arg DOTFILES_CACHEBUST=$(cat $REPO_ROOT/.dotfiles-cachebust 2>/dev/null) \
   --file $REPO_ROOT/docker/Dockerfile \
diff --git a/docker/scripts/environment.sh b/docker/scripts/environment.sh
index f0d8f16..6e9546c 100755
--- a/docker/scripts/environment.sh
+++ b/docker/scripts/environment.sh
@@ -1,8 +1,8 @@
 REPO_ROOT=$(dirname $(readlink -f $0))/../..
 
-DESKTOP_ENVIRONMENT_CONTAINER_NAME=desktop-environment
-DESKTOP_ENVIRONMENT_REGISTRY=sabrehagen
 DESKTOP_ENVIRONMENT_USER=$USER
+DESKTOP_ENVIRONMENT_CONTAINER_NAME=desktop-environment
+DESKTOP_ENVIRONMENT_REGISTRY=${DESKTOP_ENVIRONMENT_REGISTRY-$DESKTOP_ENVIRONMENT_USER}
 
 # Desktop environment repository information
 echo export DESKTOP_ENVIRONMENT_CONTAINER_NAME=$DESKTOP_ENVIRONMENT_CONTAINER_NAME