From 77d4bff67a513e7dfb8e14d03397ac61ea4cb07c Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Mon, 15 Jul 2019 14:11:56 +1000
Subject: [PATCH] cachebust

---
 .gitignore                       | 1 +
 docker/scripts/build-dotfiles.sh | 7 +++++--
 docker/scripts/build.sh          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 14af932..59c1cf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 google.json
 logs/
+.dotfiles-cachebust
diff --git a/docker/scripts/build-dotfiles.sh b/docker/scripts/build-dotfiles.sh
index db25250..f3676b7 100755
--- a/docker/scripts/build-dotfiles.sh
+++ b/docker/scripts/build-dotfiles.sh
@@ -3,5 +3,8 @@ REPO_ROOT=$(dirname $(readlink -f $0))/../..
 # Export desktop environment shell configuration
 eval "$($REPO_ROOT/docker/scripts/environment.sh)"
 
-# Rebuild the desktop environment from dotfiles onwards
-DOTFILES_CACHEBUST=$(date) $REPO_ROOT/docker/scripts/build.sh
+# Set the cachebust file to rebuild from dotfiles onwards
+DOTFILES_CACHEBUST=$(date +%s > $REPO_ROOT/.dotfiles-cachebust)
+
+# Rebuild the desktop environment
+$REPO_ROOT/docker/scripts/build.sh
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 9de7e81..75a597c 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -6,7 +6,7 @@ eval "$($REPO_ROOT/docker/scripts/environment.sh)"
 docker build \
   --build-arg DESKTOP_CONTAINER_BUILD_DATE=$(date +%s) \
   --build-arg DESKTOP_CONTAINER_GIT_SHA=$(git --git-dir $REPO_ROOT/.git rev-parse HEAD | cut -b 1-7) \
-  --build-arg DOTFILES_CACHEBUST \
+  --build-arg DOTFILES_CACHEBUST=$(cat $REPO_ROOT/.dotfiles-cachebust 2>/dev/null) \
   --file $REPO_ROOT/docker/Dockerfile \
   --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:$DESKTOP_ENVIRONMENT_CONTAINER_TAG \
   --tag $DESKTOP_ENVIRONMENT_REGISTRY/$DESKTOP_ENVIRONMENT_CONTAINER_NAME:latest \