From 88f711b6e7cca2c52dc377b5d5d1e43d3bc976e7 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 24 Jun 2016 15:24:31 -0400 Subject: [PATCH 1/6] before sanitization --- bin/compile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/compile b/bin/compile index 55d2b5a..93bcc2e 100755 --- a/bin/compile +++ b/bin/compile @@ -55,11 +55,15 @@ export PATH=$PATH:$ROOT_DIR/vendor/pip-pop [ ! "$REQUEST_ID" ] && REQUEST_ID=$SLUG_ID [ ! "$STACK" ] && STACK=$DEFAULT_PYTHON_STACK +echo ' ----- before sanitization' +env + # Sanitizing environment variables. unset GIT_DIR PYTHONHOME PYTHONPATH LD_LIBRARY_PATH LIBRARY_PATH unset RECEIVE_DATA RUN_KEY BUILD_INFO DEPLOY LOG_TOKEN DYNO unset CYTOKINE_LOG_FILE GEM_PATH + # Setup buildpack instrumentation. bpwatch init $LOGPLEX_KEY bpwatch build python $BUILDPACK_VERSION $REQUEST_ID From 2693de45c78f7e30517f052e2502afc88851d955 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 24 Jun 2016 15:40:57 -0400 Subject: [PATCH 2/6] attempt to ln --- bin/compile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 93bcc2e..3ab9ac0 100755 --- a/bin/compile +++ b/bin/compile @@ -96,7 +96,8 @@ if [[ ! "$DOCKER_BUILD" ]]; then # Copy Application code in. bpwatch start appdir_stage - deep-cp $BUILD_DIR $APP_DIR + # deep-cp $BUILD_DIR $APP_DIR + ln $BUILD_DIR/* $APP_DIR bpwatch stop appdir_stage fi From 49e409cb6457063d7d1e890ec4cf04b642b9c89d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 24 Jun 2016 15:42:55 -0400 Subject: [PATCH 3/6] try soft links --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 3ab9ac0..c6045f6 100755 --- a/bin/compile +++ b/bin/compile @@ -97,7 +97,7 @@ if [[ ! "$DOCKER_BUILD" ]]; then # Copy Application code in. bpwatch start appdir_stage # deep-cp $BUILD_DIR $APP_DIR - ln $BUILD_DIR/* $APP_DIR + ln -s $BUILD_DIR/* $APP_DIR bpwatch stop appdir_stage fi From 6bc94eaf6e8175c16a14eeeb0ed638f264c4002c Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 24 Jun 2016 15:46:27 -0400 Subject: [PATCH 4/6] dont unset library path --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index c6045f6..d4ca906 100755 --- a/bin/compile +++ b/bin/compile @@ -59,7 +59,7 @@ echo ' ----- before sanitization' env # Sanitizing environment variables. -unset GIT_DIR PYTHONHOME PYTHONPATH LD_LIBRARY_PATH LIBRARY_PATH +unset GIT_DIR PYTHONHOME PYTHONPATH unset RECEIVE_DATA RUN_KEY BUILD_INFO DEPLOY LOG_TOKEN DYNO unset CYTOKINE_LOG_FILE GEM_PATH From 6ea6a0ccaf78b887587fddbdfda82361567a4d6f Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 24 Jun 2016 15:51:28 -0400 Subject: [PATCH 5/6] debug --- bin/compile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index d4ca906..e830c3d 100755 --- a/bin/compile +++ b/bin/compile @@ -55,8 +55,6 @@ export PATH=$PATH:$ROOT_DIR/vendor/pip-pop [ ! "$REQUEST_ID" ] && REQUEST_ID=$SLUG_ID [ ! "$STACK" ] && STACK=$DEFAULT_PYTHON_STACK -echo ' ----- before sanitization' -env # Sanitizing environment variables. unset GIT_DIR PYTHONHOME PYTHONPATH @@ -123,6 +121,9 @@ export LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/. export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH +echo ' ----- here we go!' +env + # Switch to the repo's context. cd $BUILD_DIR From 831d73e3022e02cc45f23b67466241d123607c91 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 17 Aug 2016 02:06:36 -0400 Subject: [PATCH 6/6] cleanup debugging --- bin/compile | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/compile b/bin/compile index e830c3d..a88469c 100755 --- a/bin/compile +++ b/bin/compile @@ -121,9 +121,6 @@ export LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/. export LD_LIBRARY_PATH=/app/.heroku/vendor/lib:$BUILD_DIR/.heroku/vendor/lib:/app/.heroku/python/lib:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=/app/.heroku/vendor/lib/pkg-config:$BUILD_DIR/.heroku/vendor/lib/pkg-config:/app/.heroku/python/lib/pkg-config:$PKG_CONFIG_PATH -echo ' ----- here we go!' -env - # Switch to the repo's context. cd $BUILD_DIR