maverick/desktop-environment
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/desktop-environment.git synced 2026-07-25 22:27:20 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

cachebust

Browse source
This commit is contained in:
Jackson Delahunt 2019-07-15 14:11:56 +10:00
parent aef8058c96
commit 77d4bff67a
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
google.json
logs/
.dotfiles-cachebust

7
docker/scripts/build-dotfiles.sh
View file

@ -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

2
docker/scripts/build.sh
View file

@ -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 \