From d371c0c7cd4d92eefbe40b8d259be191855a05fa Mon Sep 17 00:00:00 2001 From: Stefano Rova Date: Fri, 30 Apr 2021 14:17:36 +0200 Subject: [PATCH 01/39] Update manifest.yml --- manifest.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.yml b/manifest.yml index 2bc7dd055..10b73811a 100644 --- a/manifest.yml +++ b/manifest.yml @@ -23,34 +23,34 @@ dependencies: uri: https://pivotal-buildpacks.s3.amazonaws.com/concourse-binaries/node/node-0.10.43-linux-x64.tgz md5: 10eb71941ea92ac61aa470396a590ddd 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 From f29df4b165d806cb37c64c0ae8cabfaa3c4f668c Mon Sep 17 00:00:00 2001 From: Stefano Rova Date: Fri, 30 Apr 2021 16:32:40 +0200 Subject: [PATCH 02/39] Update manifest.yml --- manifest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.yml b/manifest.yml index 10b73811a..e1e989c7c 100644 --- a/manifest.yml +++ b/manifest.yml @@ -19,9 +19,9 @@ 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.xz + md5: 98ce7e4e5f53c53fdbbc30331fc0e229 cf_stacks: - cflinuxfs3 - name: node From 115d46b2adbd46d6f598e7cf807fe0a5857f76f0 Mon Sep 17 00:00:00 2001 From: Stefano Rova Date: Fri, 30 Apr 2021 16:53:55 +0200 Subject: [PATCH 03/39] Update manifest.yml --- manifest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.yml b/manifest.yml index e1e989c7c..9de56e195 100644 --- a/manifest.yml +++ b/manifest.yml @@ -20,8 +20,8 @@ url_to_dependency_map: dependencies: - name: node version: 14.16.1 - uri: https://nodejs.org/dist/v14.16.1/node-v14.16.1-linux-x64.tar.xz - md5: 98ce7e4e5f53c53fdbbc30331fc0e229 + uri: https://nodejs.org/dist/v14.16.1/node-v14.16.1-linux-x64.tar.gz + md5: d7cf80c3bf90c3ab70558d9f4ed43a8e cf_stacks: - cflinuxfs3 - name: node From 6951c517374aea8cf532dc6189a6397a79838222 Mon Sep 17 00:00:00 2001 From: Stefano Rova Date: Fri, 30 Apr 2021 17:26:34 +0200 Subject: [PATCH 04/39] Update binaries_java.sh --- lib/binaries_java.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 9d843fe5a..19ce6e48d 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -2,9 +2,9 @@ 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://download.java.net/openjdk/jdk8u41/ri/openjdk_jre_ri-8u41-b04-linux-i586-14_jan_2020.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 "Installing JAVA" @@ -12,7 +12,7 @@ install_java() { mkdir $dir tar xzf /tmp/java.tar.gz -C /tmp/jdk rm -rf $dir/* - mv /tmp/jdk/jdk1.8.0_73/* $dir + mv /tmp/jdk/java-se-8u41-ri/* $dir chmod +x $dir/bin echo "Installation complete!" -} \ No newline at end of file +} From 33b3d14f5542bceb00657b4a32f840360a615b0c Mon Sep 17 00:00:00 2001 From: Stefano Rova Date: Fri, 30 Apr 2021 17:30:40 +0200 Subject: [PATCH 05/39] Update binaries_java.sh --- lib/binaries_java.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 19ce6e48d..314c07fec 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -2,7 +2,7 @@ install_java() { local version="$1" local dir="$2" - local download_url="https://download.java.net/openjdk/jdk8u41/ri/openjdk_jre_ri-8u41-b04-linux-i586-14_jan_2020.tar.gz" + local download_url="https://download.java.net/openjdk/jdk8u41/ri/openjdk-8u41-b04-linux-x64-14_jan_2020.tar.gz" echo "Downloading JAVA [$download_url]" 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!" From 75bd417424827003bab18d24e79afa8909b0d5a1 Mon Sep 17 00:00:00 2001 From: Stefano Rova Date: Fri, 30 Apr 2021 17:42:53 +0200 Subject: [PATCH 06/39] Update binaries_java.sh --- lib/binaries_java.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 314c07fec..38da81ac7 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -15,4 +15,10 @@ install_java() { mv /tmp/jdk/java-se-8u41-ri/* $dir chmod +x $dir/bin echo "Installation complete!" + + export PATH="/tmp/jdk/bin:$PATH" + echo "PATH exported" + echo $PATH + + } From fe901df4051c794a247e78ff46fc610f72b31423 Mon Sep 17 00:00:00 2001 From: Stefano Rova Date: Fri, 30 Apr 2021 17:48:21 +0200 Subject: [PATCH 07/39] Update binaries_java.sh --- lib/binaries_java.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 38da81ac7..2b7b851c9 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -19,6 +19,9 @@ install_java() { export PATH="/tmp/jdk/bin:$PATH" echo "PATH exported" echo $PATH + export JAVA_HOME="/tmp/jdk" + echo $JAVA_HOME + } From a249c33a6542b9fd63671a6a05fb28532b592b77 Mon Sep 17 00:00:00 2001 From: Stefano Rova Date: Fri, 30 Apr 2021 17:55:56 +0200 Subject: [PATCH 08/39] Update compile --- bin/compile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/compile b/bin/compile index c239a0054..650f210b7 100755 --- a/bin/compile +++ b/bin/compile @@ -134,6 +134,10 @@ header "Restoring cache" restore_cache | output "$LOG_FILE" build_dependencies() { + echo "Verifico JAVA" + echo $JAVA_HOME + echo java --version + if $PREBUILD; then echo "Prebuild detected (node_modules already exists)" rebuild_node_modules "$BUILD_DIR" From f621264d87fb6481ceae5e2c6d2df9374aea0625 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Fri, 30 Apr 2021 18:03:27 +0200 Subject: [PATCH 09/39] xx --- bin/compile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/compile b/bin/compile index 650f210b7..a5905e73f 100755 --- a/bin/compile +++ b/bin/compile @@ -103,7 +103,7 @@ 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" # install_swift "$swift_engine" "$BUILD_DIR/.heroku/swift" @@ -135,9 +135,8 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" - echo $JAVA_HOME echo java --version - + if $PREBUILD; then echo "Prebuild detected (node_modules already exists)" rebuild_node_modules "$BUILD_DIR" From 352ef5c5fc9b0ff1fdbd4b86fa02aca4e4c9f970 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Fri, 30 Apr 2021 18:08:32 +0200 Subject: [PATCH 10/39] xx --- bin/compile | 6 +++++- lib/binaries_java.sh | 16 ++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/compile b/bin/compile index a5905e73f..b99df069a 100755 --- a/bin/compile +++ b/bin/compile @@ -134,8 +134,12 @@ header "Restoring cache" restore_cache | output "$LOG_FILE" build_dependencies() { + ls -l $dir echo "Verifico JAVA" - echo java --version + java --version + echo "************" + + if $PREBUILD; then echo "Prebuild detected (node_modules already exists)" diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 2b7b851c9..03cdc2526 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -1,7 +1,7 @@ install_java() { local version="$1" local dir="$2" - + local download_url="https://download.java.net/openjdk/jdk8u41/ri/openjdk-8u41-b04-linux-x64-14_jan_2020.tar.gz" echo "Downloading JAVA [$download_url]" 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) @@ -14,14 +14,10 @@ install_java() { rm -rf $dir/* mv /tmp/jdk/java-se-8u41-ri/* $dir chmod +x $dir/bin - echo "Installation complete!" - - export PATH="/tmp/jdk/bin:$PATH" - echo "PATH exported" - echo $PATH - export JAVA_HOME="/tmp/jdk" - echo $JAVA_HOME + echo "Installation complete!" + + + + - - } From 3f1c0de00681ba31bf2f8dc2f739d1da7ccbc8aa Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Fri, 30 Apr 2021 18:11:38 +0200 Subject: [PATCH 11/39] debug --- bin/compile | 1 - lib/binaries_java.sh | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index b99df069a..8a5ac2480 100755 --- a/bin/compile +++ b/bin/compile @@ -134,7 +134,6 @@ header "Restoring cache" restore_cache | output "$LOG_FILE" build_dependencies() { - ls -l $dir echo "Verifico JAVA" java --version echo "************" diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 03cdc2526..7984b2313 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -7,6 +7,8 @@ install_java() { 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 "Installing JAVA" mkdir /tmp/jdk mkdir $dir @@ -15,6 +17,7 @@ install_java() { mv /tmp/jdk/java-se-8u41-ri/* $dir chmod +x $dir/bin echo "Installation complete!" + ls -l $dir From c3ca44c888a543b90dab7b5110d9482dcade1dc8 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Fri, 30 Apr 2021 18:19:38 +0200 Subject: [PATCH 12/39] debug --- bin/compile | 2 +- lib/binaries_java.sh | 3 +++ profile/nodejs.sh | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 8a5ac2480..9d9d755b7 100755 --- a/bin/compile +++ b/bin/compile @@ -135,8 +135,8 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" - java --version echo "************" + echo "build_dependencies -------------" diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 7984b2313..facffa82d 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -20,6 +20,9 @@ install_java() { ls -l $dir + echo "JAVA INSTALLATO -------------" + + diff --git a/profile/nodejs.sh b/profile/nodejs.sh index 8fd01b2b3..441c0fb0f 100755 --- a/profile/nodejs.sh +++ b/profile/nodejs.sh @@ -28,6 +28,8 @@ 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} From c3239a88eebbbade91d987bed57156cfd3b65824 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 12:34:34 +0200 Subject: [PATCH 13/39] debug --- lib/binaries_java.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index facffa82d..492d0de3e 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -15,7 +15,7 @@ install_java() { tar xzf /tmp/java.tar.gz -C /tmp/jdk rm -rf $dir/* mv /tmp/jdk/java-se-8u41-ri/* $dir - chmod +x $dir/bin + chmod +x $dir/bin/* echo "Installation complete!" ls -l $dir From 4fc5faa87818dea81c06b52357f6ccd712c1a1ee Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 12:45:35 +0200 Subject: [PATCH 14/39] debug --- lib/binaries_java.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 492d0de3e..65470c00d 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -19,8 +19,11 @@ install_java() { echo "Installation complete!" ls -l $dir +export PATH="$dir/bin:$PATH" +export JAVA_HOME="$dir" echo "JAVA INSTALLATO -------------" + java -version From cfdfe6123e3c61ff152dfa363c2f8492981b96f3 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 12:51:29 +0200 Subject: [PATCH 15/39] debug --- bin/compile | 2 ++ lib/binaries_java.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 9d9d755b7..02842a535 100755 --- a/bin/compile +++ b/bin/compile @@ -136,6 +136,8 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" + echo $JAVA_HOME + javac -version echo "build_dependencies -------------" diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 65470c00d..04b99182b 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -23,7 +23,7 @@ export PATH="$dir/bin:$PATH" export JAVA_HOME="$dir" echo "JAVA INSTALLATO -------------" - java -version + javac -version From 668d8fd2420af438774312217058bfade2d08e4b Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 12:58:19 +0200 Subject: [PATCH 16/39] debug --- bin/compile | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/compile b/bin/compile index 02842a535..37018df9e 100755 --- a/bin/compile +++ b/bin/compile @@ -136,7 +136,6 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" - echo $JAVA_HOME javac -version echo "build_dependencies -------------" From 15e57a5b27b2b8520bd93693224fa6e2fd805a01 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 13:08:53 +0200 Subject: [PATCH 17/39] debugging.... wip --- bin/compile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/compile b/bin/compile index 37018df9e..7fabf6a7d 100755 --- a/bin/compile +++ b/bin/compile @@ -136,6 +136,8 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" + ls -l /tmp + echo $PATH javac -version echo "build_dependencies -------------" From 83c5a95973e697cdd1b93a6f2402d19eeef7036b Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 13:11:22 +0200 Subject: [PATCH 18/39] debugging.... wip --- bin/compile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index 7fabf6a7d..c19872c5e 100755 --- a/bin/compile +++ b/bin/compile @@ -136,8 +136,7 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" - ls -l /tmp - echo $PATH + ls -l /tmp/app javac -version echo "build_dependencies -------------" From 5e6351f596b1175cf2a31c7a8ccce9fd517d8dba Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 13:14:12 +0200 Subject: [PATCH 19/39] debugging.... wip --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index c19872c5e..893e1ec3b 100755 --- a/bin/compile +++ b/bin/compile @@ -136,7 +136,7 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" - ls -l /tmp/app + ls -l /tmp/app/.heroku javac -version echo "build_dependencies -------------" From e3d0f76abd03b5fd4a80efb36ccc137208d5b644 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 14:19:30 +0200 Subject: [PATCH 20/39] debugging.... wip --- bin/compile | 3 +-- lib/binaries_java.sh | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/compile b/bin/compile index 893e1ec3b..4ecfce327 100755 --- a/bin/compile +++ b/bin/compile @@ -136,8 +136,7 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" - ls -l /tmp/app/.heroku - javac -version + ls -al /tmp/app echo "build_dependencies -------------" diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 04b99182b..b5ab19d84 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -7,20 +7,23 @@ install_java() { 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/java-se-8u41-ri/* $dir chmod +x $dir/bin/* echo "Installation complete!" ls -l $dir -export PATH="$dir/bin:$PATH" -export JAVA_HOME="$dir" + export PATH="$dir/bin:$PATH" + export JAVA_HOME="$dir" echo "JAVA INSTALLATO -------------" javac -version From d4c4c6030da0aae3afa010577e7a9a5e307bd0a8 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 14:23:24 +0200 Subject: [PATCH 21/39] debugging.... wip --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 4ecfce327..f8c09bdd9 100755 --- a/bin/compile +++ b/bin/compile @@ -136,7 +136,7 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" - ls -al /tmp/app + ls -al /tmp/app/.heroku echo "build_dependencies -------------" From 5a30e6c5ecd6d11fd45e31589ebb6eb8fb25114c Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 14:37:09 +0200 Subject: [PATCH 22/39] debugging.... wip --- bin/compile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index f8c09bdd9..52973ccb3 100755 --- a/bin/compile +++ b/bin/compile @@ -136,9 +136,15 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" - ls -al /tmp/app/.heroku + ls -al /tmp/app/.heroku/java echo "build_dependencies -------------" + export PATH=" /tmp/app/.heroku/java:$PATH" + export JAVA_HOME="/tmp/app/.heroku/java" + + echo "JAVA INSTALLATO -------------" + javac -version + if $PREBUILD; then From 81a4a7b90be8e8e96cad70b123ad8995202588b1 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 14:40:38 +0200 Subject: [PATCH 23/39] debugging.... wip --- bin/compile | 3 ++- lib/binaries_java.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 52973ccb3..4b42ebe38 100755 --- a/bin/compile +++ b/bin/compile @@ -136,8 +136,9 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" - ls -al /tmp/app/.heroku/java + ls -al /tmp/app/.heroku/java/bin echo "build_dependencies -------------" + whoami export PATH=" /tmp/app/.heroku/java:$PATH" export JAVA_HOME="/tmp/app/.heroku/java" diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index b5ab19d84..617d37af6 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -26,6 +26,8 @@ install_java() { export JAVA_HOME="$dir" echo "JAVA INSTALLATO -------------" + whoami + javac -version From 7fdba09693bc237d543778bfccfaf43d19b7804a Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 14:45:00 +0200 Subject: [PATCH 24/39] debugging.... wip --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 4b42ebe38..a5e9162ee 100755 --- a/bin/compile +++ b/bin/compile @@ -105,7 +105,7 @@ install_bins() { 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" } From 3e750a3270b6431f8efbc0486cdb968ae7ab0a39 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 14:45:52 +0200 Subject: [PATCH 25/39] debugging.... wip --- bin/compile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bin/compile b/bin/compile index a5e9162ee..b4d3f6208 100755 --- a/bin/compile +++ b/bin/compile @@ -108,12 +108,17 @@ install_bins() { #stefa install_maven "$maven_engine" "$BUILD_DIR/.heroku/maven" # install_swift "$swift_engine" "$BUILD_DIR/.heroku/swift" install_cfcli "$BUILD_DIR/.heroku/cf" + echo "-------------------- 1" + echo $JAVA_HOME } header "Installing binaries" install_bins | output "$LOG_FILE" restore_cache() { + echo "-------------------- 2" + echo $JAVA_HOME + local cache_status="$(get_cache_status)" if [ "$cache_status" == "valid" ]; then @@ -128,6 +133,10 @@ restore_cache() { else echo "Skipping cache restore ($cache_status)" fi + + echo "-------------------- 3" + echo $JAVA_HOME + } header "Restoring cache" From 73b9bd6409320efd7f0fad67f30bcc1e4c039fe5 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 14:52:00 +0200 Subject: [PATCH 26/39] debugging.... wip --- bin/compile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/compile b/bin/compile index b4d3f6208..ab9d86332 100755 --- a/bin/compile +++ b/bin/compile @@ -116,6 +116,9 @@ header "Installing binaries" install_bins | output "$LOG_FILE" restore_cache() { + export PATH=" /tmp/app/.heroku/java:$PATH" + export JAVA_HOME="/tmp/app/.heroku/java" + echo "-------------------- 2" echo $JAVA_HOME From eb754bb43953fa7d0dbd8d72f330180bad1aed5d Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 14:54:14 +0200 Subject: [PATCH 27/39] debugging.... wip --- bin/compile | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/compile b/bin/compile index ab9d86332..98096f6a7 100755 --- a/bin/compile +++ b/bin/compile @@ -151,6 +151,7 @@ build_dependencies() { ls -al /tmp/app/.heroku/java/bin echo "build_dependencies -------------" whoami + chmod +x /tmp/app/.heroku/java/bin/* export PATH=" /tmp/app/.heroku/java:$PATH" export JAVA_HOME="/tmp/app/.heroku/java" From 07638c6783192ac9b7e342bf2567c3e93064c0ed Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 15:01:08 +0200 Subject: [PATCH 28/39] debugging.... wip --- bin/compile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index 98096f6a7..6f3c2d45a 100755 --- a/bin/compile +++ b/bin/compile @@ -153,8 +153,8 @@ build_dependencies() { whoami chmod +x /tmp/app/.heroku/java/bin/* - export PATH=" /tmp/app/.heroku/java:$PATH" - export JAVA_HOME="/tmp/app/.heroku/java" + export PATH=" /tmp/app/.heroku/java/bin:$PATH" + export JAVA_HOME="/tmp/app/.heroku/java/bin" echo "JAVA INSTALLATO -------------" javac -version From 2d749dd5282164d46d7edd643378a8352f8bbd53 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 15:03:13 +0200 Subject: [PATCH 29/39] debugging.... wip --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 6f3c2d45a..c61d4e8e1 100755 --- a/bin/compile +++ b/bin/compile @@ -153,7 +153,7 @@ build_dependencies() { whoami chmod +x /tmp/app/.heroku/java/bin/* - export PATH=" /tmp/app/.heroku/java/bin:$PATH" + export PATH="/tmp/app/.heroku/java/bin:$PATH" export JAVA_HOME="/tmp/app/.heroku/java/bin" echo "JAVA INSTALLATO -------------" From b7f6e77f75349dce245cc0a9b699e1da6e3f6664 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 15:16:33 +0200 Subject: [PATCH 30/39] debugging.... wip --- profile/nodejs.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/profile/nodejs.sh b/profile/nodejs.sh index 441c0fb0f..aaa044637 100755 --- a/profile/nodejs.sh +++ b/profile/nodejs.sh @@ -37,6 +37,15 @@ export NODE_ENV=${NODE_ENV:-production} export PATH="$HOME/.heroku/java/bin:$PATH" export JAVA_HOME="$HOME/.heroku/java" +echo "*****************************************" +echo $HOME +echo $JAVA_HOME +echo $PATH + +java -version +echo "*****************************************" + + export PATH="$HOME/.heroku/maven/bin:$PATH" export PATH="$HOME/.heroku/swift/clang/bin:$PATH" From 7ed96697d5dde96687c1fc0a376db535ba3462d6 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 15:27:40 +0200 Subject: [PATCH 31/39] debugging.... wip --- profile/nodejs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/profile/nodejs.sh b/profile/nodejs.sh index aaa044637..9a6645216 100755 --- a/profile/nodejs.sh +++ b/profile/nodejs.sh @@ -35,7 +35,8 @@ 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 JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64" +ls -al /usr/lib/jvm/java-8-openjdk-amd64 echo "*****************************************" echo $HOME From e9c7b93a116d7f82763fab4226ef52823e0ad091 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 15:55:23 +0200 Subject: [PATCH 32/39] debugging.... wip --- profile/nodejs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/profile/nodejs.sh b/profile/nodejs.sh index 9a6645216..2837e81ac 100755 --- a/profile/nodejs.sh +++ b/profile/nodejs.sh @@ -35,8 +35,6 @@ export NODE_HOME="$HOME/.heroku/node" export NODE_ENV=${NODE_ENV:-production} export PATH="$HOME/.heroku/java/bin:$PATH" -export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64" -ls -al /usr/lib/jvm/java-8-openjdk-amd64 echo "*****************************************" echo $HOME From c289f46bdd42229ea9106bfe08773312d1bc5a2e Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 16:20:09 +0200 Subject: [PATCH 33/39] debugging.... wip --- profile/nodejs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/profile/nodejs.sh b/profile/nodejs.sh index 2837e81ac..ea240dca0 100755 --- a/profile/nodejs.sh +++ b/profile/nodejs.sh @@ -35,11 +35,13 @@ export NODE_HOME="$HOME/.heroku/node" export NODE_ENV=${NODE_ENV:-production} export PATH="$HOME/.heroku/java/bin:$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 "*****************************************" From 5435ca4b5c0be0e58c2b6e5e4220a30c9fccbd7a Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 17:44:53 +0200 Subject: [PATCH 34/39] test con java 16 --- lib/binaries_java.sh | 8 ++++++-- profile/nodejs.sh | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 617d37af6..6725f2691 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -2,7 +2,8 @@ install_java() { local version="$1" local dir="$2" - local download_url="https://download.java.net/openjdk/jdk8u41/ri/openjdk-8u41-b04-linux-x64-14_jan_2020.tar.gz" + local download_url= "https://download.java.net/openjdk/jdk16/ri/openjdk-16+36_linux-x64_bin.tar.gz" + ### "https://download.java.net/openjdk/jdk8u41/ri/openjdk-8u41-b04-linux-x64-14_jan_2020.tar.gz" echo "Downloading JAVA [$download_url]" 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!" @@ -17,7 +18,10 @@ install_java() { tar xzf /tmp/java.tar.gz -C /tmp/jdk rm -rf $dir/* - mv /tmp/jdk/java-se-8u41-ri/* $dir + # mv /tmp/jdk/java-se-8u41-ri/* $dir + mv /tmp/jdk/jdk-16/* $dir + + chmod +x $dir/bin/* echo "Installation complete!" ls -l $dir diff --git a/profile/nodejs.sh b/profile/nodejs.sh index ea240dca0..b46f722a2 100755 --- a/profile/nodejs.sh +++ b/profile/nodejs.sh @@ -35,7 +35,8 @@ export NODE_HOME="$HOME/.heroku/node" export NODE_ENV=${NODE_ENV:-production} export PATH="$HOME/.heroku/java/bin:$PATH" -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" +export LD_LIBRARY_PATH="$HOME/.heroku/java/lib/server:$LD_LIBRARY_PATH" echo "*****************************************" echo $HOME From bcaf1c116e47b9a54f0f99fdc0522a78350efa7e Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 17:50:45 +0200 Subject: [PATCH 35/39] test con java 16 --- lib/binaries_java.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 6725f2691..417c357f9 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -3,7 +3,6 @@ install_java() { local dir="$2" local download_url= "https://download.java.net/openjdk/jdk16/ri/openjdk-16+36_linux-x64_bin.tar.gz" - ### "https://download.java.net/openjdk/jdk8u41/ri/openjdk-8u41-b04-linux-x64-14_jan_2020.tar.gz" echo "Downloading JAVA [$download_url]" 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!" From 8d849b24845fef3315c007867f171e772d61a912 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Mon, 3 May 2021 17:55:52 +0200 Subject: [PATCH 36/39] test con java 11 --- lib/binaries_java.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 417c357f9..682246451 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -2,7 +2,7 @@ install_java() { local version="$1" local dir="$2" - local download_url= "https://download.java.net/openjdk/jdk16/ri/openjdk-16+36_linux-x64_bin.tar.gz" + local download_url="https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.tar.gz" echo "Downloading JAVA [$download_url]" 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!" @@ -17,8 +17,7 @@ install_java() { tar xzf /tmp/java.tar.gz -C /tmp/jdk rm -rf $dir/* - # mv /tmp/jdk/java-se-8u41-ri/* $dir - mv /tmp/jdk/jdk-16/* $dir + mv /tmp/jdk/jdk-11/* $dir chmod +x $dir/bin/* From 2088f6131c5ebe39e986642f78a6c5adfa3891bb Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Tue, 4 May 2021 08:29:33 +0200 Subject: [PATCH 37/39] test con java 8 --- lib/binaries_java.sh | 4 ++-- profile/nodejs.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 682246451..dd05c15da 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -2,7 +2,7 @@ install_java() { local version="$1" local dir="$2" - local download_url="https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_linux-x64_bin.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 "$download_url" -o /tmp/java.tar.gz || (echo "Unable to download java; does it exist?" && false) echo "Download complete!" @@ -17,7 +17,7 @@ install_java() { tar xzf /tmp/java.tar.gz -C /tmp/jdk rm -rf $dir/* - mv /tmp/jdk/jdk-11/* $dir + mv /tmp/jdk/jdk8u292-b10/* $dir chmod +x $dir/bin/* diff --git a/profile/nodejs.sh b/profile/nodejs.sh index b46f722a2..c1573e6de 100755 --- a/profile/nodejs.sh +++ b/profile/nodejs.sh @@ -35,8 +35,8 @@ export NODE_HOME="$HOME/.heroku/node" export NODE_ENV=${NODE_ENV:-production} export PATH="$HOME/.heroku/java/bin:$PATH" +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" -export LD_LIBRARY_PATH="$HOME/.heroku/java/lib/server:$LD_LIBRARY_PATH" echo "*****************************************" echo $HOME From 02040b06d5642719c9d152f6ae12692b5d4bfc9e Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Tue, 4 May 2021 10:38:35 +0200 Subject: [PATCH 38/39] tolte alcune stampe di debug --- bin/compile | 10 +--------- lib/binaries_java.sh | 4 +--- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/bin/compile b/bin/compile index c61d4e8e1..4864d7967 100755 --- a/bin/compile +++ b/bin/compile @@ -108,7 +108,6 @@ install_bins() { #stefa install_maven "$maven_engine" "$BUILD_DIR/.heroku/maven" # install_swift "$swift_engine" "$BUILD_DIR/.heroku/swift" install_cfcli "$BUILD_DIR/.heroku/cf" - echo "-------------------- 1" echo $JAVA_HOME } @@ -119,8 +118,6 @@ restore_cache() { export PATH=" /tmp/app/.heroku/java:$PATH" export JAVA_HOME="/tmp/app/.heroku/java" - echo "-------------------- 2" - echo $JAVA_HOME local cache_status="$(get_cache_status)" @@ -137,7 +134,6 @@ restore_cache() { echo "Skipping cache restore ($cache_status)" fi - echo "-------------------- 3" echo $JAVA_HOME } @@ -149,16 +145,12 @@ build_dependencies() { echo "Verifico JAVA" echo "************" ls -al /tmp/app/.heroku/java/bin - echo "build_dependencies -------------" - whoami 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 -------------" - javac -version - + echo "JAVA INSTALLATO" if $PREBUILD; then diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index dd05c15da..9f38312c5 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -27,10 +27,8 @@ install_java() { export PATH="$dir/bin:$PATH" export JAVA_HOME="$dir" - echo "JAVA INSTALLATO -------------" - whoami + echo "JAVA INSTALLATO " - javac -version From 163e3face4ff54c2f3c418420fd8a5245228f0a4 Mon Sep 17 00:00:00 2001 From: "stefano.rova" Date: Tue, 4 May 2021 11:11:13 +0200 Subject: [PATCH 39/39] rimossi ls -l --- bin/compile | 1 - lib/binaries_java.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/bin/compile b/bin/compile index 4864d7967..ef7799ae7 100755 --- a/bin/compile +++ b/bin/compile @@ -144,7 +144,6 @@ restore_cache | output "$LOG_FILE" build_dependencies() { echo "Verifico JAVA" echo "************" - ls -al /tmp/app/.heroku/java/bin chmod +x /tmp/app/.heroku/java/bin/* export PATH="/tmp/app/.heroku/java/bin:$PATH" diff --git a/lib/binaries_java.sh b/lib/binaries_java.sh index 9f38312c5..8ef650deb 100644 --- a/lib/binaries_java.sh +++ b/lib/binaries_java.sh @@ -22,7 +22,6 @@ install_java() { chmod +x $dir/bin/* echo "Installation complete!" - ls -l $dir export PATH="$dir/bin:$PATH" export JAVA_HOME="$dir"