mirror of
https://github.com/weaveworks/scope.git
synced 2026-03-03 10:11:03 +00:00
Fix rebuild-image
This commit is contained in:
@@ -4,7 +4,8 @@
|
||||
|
||||
set -eux
|
||||
|
||||
IMAGENAME=$(echo $1 | sed "s/[\/\-]/\./g")
|
||||
IMAGENAME=$1
|
||||
SAVEDNAME=$(echo $IMAGENAME | sed "s/[\/\-]/\./g")
|
||||
IMAGEDIR=$2
|
||||
shift 2
|
||||
|
||||
@@ -14,14 +15,14 @@ CACHEDIR=$HOME/docker/
|
||||
# Rebuild the image
|
||||
rebuild() {
|
||||
mkdir -p $CACHEDIR
|
||||
rm $CACHEDIR/$IMAGENAME* || true
|
||||
rm $CACHEDIR/$SAVEDNAME* || true
|
||||
docker build -t $IMAGENAME $IMAGEDIR
|
||||
docker save $IMAGENAME:latest > $CACHEDIR/$IMAGENAME-$CIRCLE_SHA1
|
||||
docker save $IMAGENAME:latest > $CACHEDIR/$SAVEDNAME-$CIRCLE_SHA1
|
||||
}
|
||||
|
||||
# Get the revision the cached image was build at
|
||||
cached_image_rev() {
|
||||
find $CACHEDIR -name "$IMAGENAME-*" -type f | sed 's/[^\-]*\-//'
|
||||
find $CACHEDIR -name "$SAVEDNAME-*" -type f | sed 's/[^\-]*\-//'
|
||||
}
|
||||
|
||||
# Have there been any revision beween $1 and $2
|
||||
@@ -48,4 +49,4 @@ fi
|
||||
|
||||
# we didn't rebuild; import cached version
|
||||
echo ">>> No changes found, importing cached image"
|
||||
docker load -i $CACHEDIR/$IMAGENAME-*
|
||||
docker load -i $CACHEDIR/$SAVEDNAME-$cached_revision
|
||||
|
||||
Reference in New Issue
Block a user