diff --git a/bin/compile b/bin/compile index c239a0054..ef7799ae7 100755 --- a/bin/compile +++ b/bin/compile @@ -103,17 +103,22 @@ install_bins() { install_npm "$npm_engine" "$BUILD_DIR/.heroku/node" fi warn_old_npm - + install_java "$java_engine" "$BUILD_DIR/.heroku/java" - install_maven "$maven_engine" "$BUILD_DIR/.heroku/maven" +#stefa install_maven "$maven_engine" "$BUILD_DIR/.heroku/maven" # install_swift "$swift_engine" "$BUILD_DIR/.heroku/swift" install_cfcli "$BUILD_DIR/.heroku/cf" + echo $JAVA_HOME } header "Installing binaries" install_bins | output "$LOG_FILE" restore_cache() { + export PATH=" /tmp/app/.heroku/java:$PATH" + export JAVA_HOME="/tmp/app/.heroku/java" + + local cache_status="$(get_cache_status)" if [ "$cache_status" == "valid" ]; then @@ -128,12 +133,25 @@ restore_cache() { else echo "Skipping cache restore ($cache_status)" fi + + echo $JAVA_HOME + } header "Restoring cache" restore_cache | output "$LOG_FILE" build_dependencies() { + echo "Verifico JAVA" + echo "************" + chmod +x /tmp/app/.heroku/java/bin/* + + export PATH="/tmp/app/.heroku/java/bin:$PATH" + export JAVA_HOME="/tmp/app/.heroku/java/bin" + + echo "JAVA INSTALLATO" + + if $PREBUILD; then echo "Prebuild detected (node_modules already exists)" rebuild_node_modules "$BUILD_DIR" diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 9d843fe5a..8ef650deb 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -1,18 +1,36 @@ install_java() { local version="$1" local dir="$2" - - local download_url="http://download.oracle.com/otn-pub/java/jdk/8u73-b02/jdk-8u73-linux-x64.tar.gz" + + local download_url="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz" echo "Downloading JAVA [$download_url]" - curl --silent --fail --retry 5 --retry-max-time 15 -j -k -L -H "Cookie: oraclelicense=accept-securebackup-cookie" "$download_url" -o /tmp/java.tar.gz || (echo "Unable to download java; does it exist?" && false) + curl --silent --fail --retry 5 --retry-max-time 15 -j -k -L "$download_url" -o /tmp/java.tar.gz || (echo "Unable to download java; does it exist?" && false) echo "Download complete!" + echo "dir -------------" + echo $dir + echo "Installing JAVA" mkdir /tmp/jdk mkdir $dir + tar xzf /tmp/java.tar.gz -C /tmp/jdk rm -rf $dir/* - mv /tmp/jdk/jdk1.8.0_73/* $dir - chmod +x $dir/bin - echo "Installation complete!" -} \ No newline at end of file + + mv /tmp/jdk/jdk8u292-b10/* $dir + + + chmod +x $dir/bin/* + echo "Installation complete!" + + export PATH="$dir/bin:$PATH" + export JAVA_HOME="$dir" + + echo "JAVA INSTALLATO " + + + + + + +} diff --git a/manifest.yml b/manifest.yml index 2bc7dd055..9de56e195 100644 --- a/manifest.yml +++ b/manifest.yml @@ -19,38 +19,38 @@ url_to_dependency_map: dependencies: - name: node - version: 0.10.43 - uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/node/node-0.10.43-linux-x64.tgz - md5: 10eb71941ea92ac61aa470396a590ddd + version: 14.16.1 + uri: https://nodejs.org/dist/v14.16.1/node-v14.16.1-linux-x64.tar.gz + md5: d7cf80c3bf90c3ab70558d9f4ed43a8e cf_stacks: - - cflinuxfs2 + - cflinuxfs3 - name: node version: 0.10.42 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/node/node-0.10.42-linux-x64.tgz md5: f475ba3d10a8e6533051fa144c6bb100 cf_stacks: - - cflinuxfs2 + - cflinuxfs3 - name: node version: 0.12.11 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/node/node-0.12.11-linux-x64.tgz md5: 82bdb949914bdfa8e0520600c24c16f4 cf_stacks: - - cflinuxfs2 + - cflinuxfs3 - name: node version: 0.12.12 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/node/node-0.12.12-linux-x64.tgz md5: 2130a67ff03ff1907b2812b40ec51ff2 cf_stacks: - - cflinuxfs2 + - cflinuxfs3 - name: node version: 4.4.0 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/node/node-4.4.0-linux-x64.tgz md5: 96c68f4f542737d44db47067274afed6 cf_stacks: - - cflinuxfs2 + - cflinuxfs3 - name: node version: 5.8.0 uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/node/node-5.8.0-linux-x64.tgz md5: d0c010517efff468651f0df80bc62adc cf_stacks: - - cflinuxfs2 + - cflinuxfs3 diff --git a/profile/nodejs.sh b/profile/nodejs.sh index 8fd01b2b3..c1573e6de 100755 --- a/profile/nodejs.sh +++ b/profile/nodejs.sh @@ -28,12 +28,25 @@ detect_memory() { esac } +echo "Settaggio variabili ambiente -------------" + export PATH="$HOME/.heroku/node/bin:$PATH:$HOME/bin:$HOME/node_modules/.bin" export NODE_HOME="$HOME/.heroku/node" export NODE_ENV=${NODE_ENV:-production} export PATH="$HOME/.heroku/java/bin:$PATH" -export JAVA_HOME="$HOME/.heroku/java" +export LD_LIBRARY_PATH="$HOME/.heroku/java/jre/lib/amd64/server:$LD_LIBRARY_PATH" +#export LD_LIBRARY_PATH="$HOME/.heroku/java/jre/lib/amd64/server:$LD_LIBRARY_PATH" + +echo "*****************************************" +echo $HOME +echo $JAVA_HOME +echo $PATH +echo $LD_LIBRARY_PATH + +java -version +echo "*****************************************" + export PATH="$HOME/.heroku/maven/bin:$PATH"