From a50ab24f586d1e9c3a7697bf36675e9c6eb5befc Mon Sep 17 00:00:00 2001 From: Vadim Abdrashitov Date: Wed, 29 Jul 2015 22:13:31 +0500 Subject: [PATCH 01/11] Update compile added -r for rm --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index b38945f..b71dd65 100755 --- a/bin/compile +++ b/bin/compile @@ -108,7 +108,7 @@ dnu restore $DNU_FLAGS ${PROJECT_JSON_FILE} dnu publish --out ${BUILD_DIR} $DNU_FLAGS --no-source --configuration Release ${PROJECT_JSON_FILE} # Clean out core-stuff that we don't need in the slug -find ${BUILD_DIR} -iname dnxcore50 -print0 | xargs -r -0 rm -- +find ${BUILD_DIR} -iname dnxcore50 -print0 | xargs -r -0 rm -r -- mkdir -p ${BUILD_DIR}/.profile.d cp -n ${BUILDPACK_DIR}/.profile.d/* ${BUILD_DIR}/.profile.d/ From 7c8d43fc0d611d4120141f66a39a5f7fb80f0533 Mon Sep 17 00:00:00 2001 From: Vadim Abdrashitov Date: Thu, 30 Jul 2015 22:27:44 +0500 Subject: [PATCH 02/11] Rename Framework in Dnx --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index b71dd65..647cf10 100755 --- a/bin/compile +++ b/bin/compile @@ -122,7 +122,7 @@ else if [ $( echo "${ROOTS}" | wc -l ) -gt 0 ]; then APP_ROOT=$(echo "$ROOTS" | head -1) cat << EOT >> ${BUILD_DIR}/Procfile -web: dnx --appbase $APP_ROOT Microsoft.Framework.ApplicationHost kestrel --configuration Release --server.urls http://+:\$PORT +web: dnx --appbase $APP_ROOT Microsoft.Dnx.ApplicationHost kestrel --configuration Release --server.urls http://+:\$PORT EOT fi fi From 1e4f79fd33477853d886ef83b9338a38dbc416a4 Mon Sep 17 00:00:00 2001 From: jincod Date: Sun, 25 Oct 2015 16:52:18 +0500 Subject: [PATCH 03/11] fix dnvm install --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 3eca9ad..9f895a4 100755 --- a/bin/compile +++ b/bin/compile @@ -88,7 +88,7 @@ mkdir -p ${DNVM_RUNTIME_CACHE_LOCATION} ln -s ${DNVM_RUNTIME_CACHE_LOCATION} ${DNVM_RUNTIME_LOCAL_CACHE}/runtimes # TODO: extract DNX version from global.json -dnvm install $DNX_VERSION $DNVM_FLAGS -a default +dnvm install $DNX_VERSION $DNVM_FLAGS -alias default # Add DNX to the build output DNX_BUILD_LOCATION=${BUILD_DIR}/.dnx/runtimes/ From d4c5ceff4b59f7d1cfd13815f8732066dc4c882c Mon Sep 17 00:00:00 2001 From: jincod Date: Sun, 25 Oct 2015 18:11:03 +0500 Subject: [PATCH 04/11] change run command --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 9f895a4..f90b3e0 100755 --- a/bin/compile +++ b/bin/compile @@ -134,7 +134,7 @@ else if [ $( echo "${ROOTS}" | wc -l ) -gt 0 ]; then APP_ROOT=$(echo "$ROOTS" | head -1) cat << EOT >> ${BUILD_DIR}/Procfile -web: ./kestrel --server.urls http://+:\$PORT +web: ./approot/web --server.urls http://+:\$PORT EOT fi fi From 2088d432e319d84ac497d299d829903403304684 Mon Sep 17 00:00:00 2001 From: jincod Date: Sun, 29 Nov 2015 15:33:59 +0500 Subject: [PATCH 05/11] fix path --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index f90b3e0..048c1f3 100755 --- a/bin/compile +++ b/bin/compile @@ -65,7 +65,7 @@ cp -r ~/.config ${BUILD_DIR}/. # TODO: This test doesn't seen to actually work # TODO: Maybe just run `npm install -g` and if anything is missing, install it after -if [[ -n $(find . -type f -iname package.json -o -iname bower.json -o -iname gruntfile.js) ]] +if [[ -n $(find ${SRC_DIR}/. -type f -iname package.json -o -iname bower.json -o -iname gruntfile.js) ]] then # Install Node and grunt-cli NODE_PATH=`mktemp -d` From be8e49958c09ad50a1578cefa39c2d71faab9828 Mon Sep 17 00:00:00 2001 From: jincod Date: Sun, 29 Nov 2015 16:22:41 +0500 Subject: [PATCH 06/11] added NODE_ENV to whitelist --- bin/util | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/util b/bin/util index 857c240..666db02 100644 --- a/bin/util +++ b/bin/util @@ -14,7 +14,7 @@ function conditional_download() { function export_env_dir() { local env_dir=$1 - local whitelist_regex=${2:-'(DEPENDENCY_S3_BUCKET_PATH|MONO_VERSION|LIBUV_VERSION|NODE_VERSION|PROJECT|BUILD_DEBUG|DNVM_BRANCH|DNX_VERSION)$'} + local whitelist_regex=${2:-'(DEPENDENCY_S3_BUCKET_PATH|MONO_VERSION|LIBUV_VERSION|NODE_VERSION|NODE_ENV|PROJECT|BUILD_DEBUG|DNVM_BRANCH|DNX_VERSION)$'} local blacklist_regex=${3:-'^(PATH|GIT_DIR|CPATH|CPPATH|LD_PRELOAD|LIBRARY_PATH)$'} if [ -d "$env_dir" ]; then for e in $(ls $env_dir); do From 5d00a025e325321356c4f0076996ad6cbc4db88b Mon Sep 17 00:00:00 2001 From: jincod Date: Mon, 22 Feb 2016 21:03:35 +0500 Subject: [PATCH 07/11] drop nodejs instalation --- bin/compile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/bin/compile b/bin/compile index 048c1f3..299d6b0 100755 --- a/bin/compile +++ b/bin/compile @@ -21,7 +21,6 @@ export_env_dir ${ENV_DIR} : ${MONO_VERSION:="4.0.1.44"} : ${MONO_DOWNLOAD_LOCATION:="https://github.com/friism/mono-builder/releases/download/v${MONO_VERSION}/mono-${MONO_VERSION}.tar.gz"} : ${LIBUV_VERSION:="1.6.0"} -: ${NODE_VERSION:="0.12.2"} : ${DNVM_BRANCH:="dev"} : ${DNX_VERSION:="latest"} @@ -63,18 +62,6 @@ export LD_LIBRARY_PATH="/app/mono/lib:${LD_LIBRARY_PATH}" mozroots --import --sync --quiet cp -r ~/.config ${BUILD_DIR}/. -# TODO: This test doesn't seen to actually work -# TODO: Maybe just run `npm install -g` and if anything is missing, install it after -if [[ -n $(find ${SRC_DIR}/. -type f -iname package.json -o -iname bower.json -o -iname gruntfile.js) ]] -then - # Install Node and grunt-cli - NODE_PATH=`mktemp -d` - curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz -Ls \ - | tar xz -C ${NODE_PATH} - export PATH="${NODE_PATH}/node-v${NODE_VERSION}-linux-x64/bin:${PATH}" - npm install -g grunt-cli bower gulp -fi - # Install DNX # TODO: consider making this not dependent on GitHub being up touch ~/.profile From 24836159fe4765bce29d0172b70a0c8a67073dab Mon Sep 17 00:00:00 2001 From: jincod Date: Sat, 27 Feb 2016 21:49:36 +0500 Subject: [PATCH 08/11] return back .heroku folder --- bin/compile | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/compile b/bin/compile index 299d6b0..93a8b27 100755 --- a/bin/compile +++ b/bin/compile @@ -46,6 +46,7 @@ SRC_DIR=`mktemp -d` ( shopt -s dotglob mv ${BUILD_DIR}/* ${SRC_DIR} + mv ${SRC_DIR}/.heroku ${BUILD_DIR} ) mkdir -p ${CACHE_DIR} From aa597efb2e28f9ef300bbe5706101f4b9ec9b8fd Mon Sep 17 00:00:00 2001 From: Vadim Abdrashitov Date: Mon, 4 Apr 2016 13:05:17 +0500 Subject: [PATCH 09/11] Check .heroku folder is exists --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 93a8b27..fbd4cd4 100755 --- a/bin/compile +++ b/bin/compile @@ -46,7 +46,7 @@ SRC_DIR=`mktemp -d` ( shopt -s dotglob mv ${BUILD_DIR}/* ${SRC_DIR} - mv ${SRC_DIR}/.heroku ${BUILD_DIR} + [ -d "${SRC_DIR}/.heroku" ] && mv ${SRC_DIR}/.heroku ${BUILD_DIR} ) mkdir -p ${CACHE_DIR} From 6adbeb1c2b44218a89b986f1f8cd97dca3fc5f65 Mon Sep 17 00:00:00 2001 From: jincod Date: Tue, 12 Apr 2016 22:52:06 +0500 Subject: [PATCH 10/11] fix strange behavior --- bin/compile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index fbd4cd4..fc6890c 100755 --- a/bin/compile +++ b/bin/compile @@ -46,7 +46,9 @@ SRC_DIR=`mktemp -d` ( shopt -s dotglob mv ${BUILD_DIR}/* ${SRC_DIR} - [ -d "${SRC_DIR}/.heroku" ] && mv ${SRC_DIR}/.heroku ${BUILD_DIR} + if [ -d "${SRC_DIR}/.heroku" ]; then + mv ${SRC_DIR}/.heroku ${BUILD_DIR} + fi ) mkdir -p ${CACHE_DIR} From 36eace0421619a9d8bdd7dd2f70ca8b2ca09dcdd Mon Sep 17 00:00:00 2001 From: Nicolas McCurdy Date: Mon, 9 May 2016 15:08:21 -0400 Subject: [PATCH 11/11] make it clear that this buildpack is experimental (#1) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9fe9821..fc59dca 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +**Please note:** This buildpack is an experimental project and is not officially supported. + # ASP.NET 5 Buildpack This is a [Heroku buildpack](http://devcenter.heroku.com/articles/buildpack) for building [ASP.NET 5](http://www.asp.net/vnext/overview/aspnet-vnext/aspnet-5-overview) apps using [`project.json` files](https://github.com/aspnet/Home/wiki/Project.json-file) and the [kpm package manager](https://github.com/aspnet/Home/wiki/Package-Manager).