Skip to content
Snippets Groups Projects
Commit c0fbb072 authored by Kenneth Reitz's avatar Kenneth Reitz
Browse files

attempt to whitelist cache entries for python buildpack

parent 6ab397db
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# Fail fast and fail hard. # Fail fast and fail hard.
set -eo pipefail set -eo pipefail
shopt -s extglob
[ "$BUILDPACK_XTRACE" ] && set -o xtrace [ "$BUILDPACK_XTRACE" ] && set -o xtrace
...@@ -20,7 +21,7 @@ CACHE_DIR=$2 ...@@ -20,7 +21,7 @@ CACHE_DIR=$2
ENV_DIR=$3 ENV_DIR=$3
CACHED_DIRS=".heroku" CACHED_DIR=".heroku"
WHITELISTED_CACHE_ENTRIES="python|python-stack|python-version|venv|vendor" WHITELISTED_CACHE_ENTRIES="python|python-stack|python-version|venv|vendor"
# Static configurations for virtualenv caches. # Static configurations for virtualenv caches.
...@@ -144,12 +145,14 @@ bpwatch start clear_old_venvs ...@@ -144,12 +145,14 @@ bpwatch start clear_old_venvs
[ -d $CACHE_DIR/$VIRTUALENV_LOC ] && rm -fr $CACHE_DIR/.heroku/venv $CACHE_DIR/.heroku/src [ -d $CACHE_DIR/$VIRTUALENV_LOC ] && rm -fr $CACHE_DIR/.heroku/venv $CACHE_DIR/.heroku/src
bpwatch stop clear_old_venvs bpwatch stop clear_old_venvs
cd $CACHE_DIR
rm !($WHITELISTED_CACHE_ENTRIES)
cd $BUILD_DIR
# Restore old artifacts from the cache. # Restore old artifacts from the cache.
bpwatch start restore_cache bpwatch start restore_cache
for dir in $CACHED_DIRS; do cp -R $CACHE_DIR/$CACHED_DIR . &> /dev/null || true
cp -R $CACHE_DIR/$dir . &> /dev/null || true
done
ls -1 | grep -E -v "$WHITELISTED_CACHE_ENTRIES" | xargs rm -f
bpwatch stop restore_cache bpwatch stop restore_cache
set +e set +e
...@@ -211,10 +214,8 @@ bpwatch stop post_compile ...@@ -211,10 +214,8 @@ bpwatch stop post_compile
# Store new artifacts in cache. # Store new artifacts in cache.
bpwatch start dump_cache bpwatch start dump_cache
for dir in $CACHED_DIRS; do
rm -rf $CACHE_DIR/$dir rm -rf $CACHE_DIR/$dir
cp -R $dir $CACHE_DIR/ cp -R $dir $CACHE_DIR/
done
bpwatch stop dump_cache bpwatch stop dump_cache
# ### Fin. # ### Fin.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment