From 09460d909bc9f793e173e384f7396d4adbb07f3c Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Mon, 17 Jul 2023 06:02:55 +0100 Subject: [PATCH 1/2] Migrate java and kotlin to exec.d Migrate buildpacks from the deprecated profile.d to exec.d Signed-off-by: Aidan Delaney --- builders/alpine/builder.toml | 4 ++-- builders/jammy/builder.toml | 4 ++-- buildpacks/java-maven/bin/build | 10 +++++----- buildpacks/java-maven/buildpack.toml | 2 +- buildpacks/kotlin-gradle/bin/build | 10 +++++----- buildpacks/kotlin-gradle/buildpack.toml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/builders/alpine/builder.toml b/builders/alpine/builder.toml index 58198d7a..cab57194 100644 --- a/builders/alpine/builder.toml +++ b/builders/alpine/builder.toml @@ -37,12 +37,12 @@ version = "0.0.1" [[order]] [[order.group]] id = "samples/java-maven" -version = "0.0.1" +version = "0.0.2" [[order]] [[order.group]] id = "samples/kotlin-gradle" -version = "0.0.1" +version = "0.0.2" [[order]] [[order.group]] diff --git a/builders/jammy/builder.toml b/builders/jammy/builder.toml index 40a642b7..ace8c2ca 100644 --- a/builders/jammy/builder.toml +++ b/builders/jammy/builder.toml @@ -21,12 +21,12 @@ uri = "docker://cnbs/sample-package:hello-universe" [[order]] [[order.group]] id = "samples/java-maven" -version = "0.0.1" +version = "0.0.2" [[order]] [[order.group]] id = "samples/kotlin-gradle" -version = "0.0.1" +version = "0.0.2" [[order]] [[order.group]] diff --git a/buildpacks/java-maven/bin/build b/buildpacks/java-maven/bin/build index 227f6323..4e95adab 100755 --- a/buildpacks/java-maven/bin/build +++ b/buildpacks/java-maven/bin/build @@ -59,13 +59,13 @@ EOF echo "${JAVA_HOME}/jre/lib/amd64/server:${LD_LIBRARY_PATH}" > ${jdk_layer_dir}/env/LD_LIBRARY_PATH fi - mkdir -p ${jdk_layer_dir}/profile.d - cat > "${jdk_layer_dir}/profile.d/jdk.sh" << EOF -export JAVA_HOME=${jdk_layer_dir} + mkdir -p ${jdk_layer_dir}/exec.d + cat > "${jdk_layer_dir}/exec.d/jdk.sh" << EOF +echo JAVA_HOME=${jdk_layer_dir} > \$1 if [[ -z \$LD_LIBRARY_PATH ]]; then - export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server" + echo LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server" >> \$1 else - export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server:${LD_LIBRARY_PATH}" + echo LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server:${LD_LIBRARY_PATH}" >> \$1 fi EOF fi diff --git a/buildpacks/java-maven/buildpack.toml b/buildpacks/java-maven/buildpack.toml index bb1caf62..2396278a 100644 --- a/buildpacks/java-maven/buildpack.toml +++ b/buildpacks/java-maven/buildpack.toml @@ -4,7 +4,7 @@ api = "0.9" # Buildpack ID and metadata [buildpack] id = "samples/java-maven" -version = "0.0.1" +version = "0.0.2" name = "Sample Java Maven Buildpack" homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/java-maven" diff --git a/buildpacks/kotlin-gradle/bin/build b/buildpacks/kotlin-gradle/bin/build index b5c42b83..61905c95 100755 --- a/buildpacks/kotlin-gradle/bin/build +++ b/buildpacks/kotlin-gradle/bin/build @@ -56,13 +56,13 @@ EOF echo "${JAVA_HOME}/jre/lib/amd64/server:${LD_LIBRARY_PATH}" > ${jdk_layer_dir}/env/LD_LIBRARY_PATH fi - mkdir -p ${jdk_layer_dir}/profile.d - cat > "${jdk_layer_dir}/profile.d/jdk.sh" << EOF -export JAVA_HOME=${jdk_layer_dir} + mkdir -p ${jdk_layer_dir}/exec.d + cat > "${jdk_layer_dir}/exec.d/jdk.sh" << EOF +echo JAVA_HOME=${jdk_layer_dir} > \$1 if [[ -z \$LD_LIBRARY_PATH ]]; then - export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server" + echo LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server" >> \$1 else - export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server:${LD_LIBRARY_PATH}" + echo LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server:${LD_LIBRARY_PATH}" >> \$1 fi EOF fi diff --git a/buildpacks/kotlin-gradle/buildpack.toml b/buildpacks/kotlin-gradle/buildpack.toml index 216fa1b8..dd2bfc7f 100644 --- a/buildpacks/kotlin-gradle/buildpack.toml +++ b/buildpacks/kotlin-gradle/buildpack.toml @@ -4,7 +4,7 @@ api = "0.9" # Buildpack ID and metadata [buildpack] id = "samples/kotlin-gradle" -version = "0.0.1" +version = "0.0.2" name = "Sample Kotlin Gradle Buildpack" homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/kotlin-gradle" From fd3c46820b21b59e0b2f26a02aeebe4fd6e799d2 Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Mon, 17 Jul 2023 06:10:07 +0100 Subject: [PATCH 2/2] fixup! Migrate java and kotlin to exec.d Signed-off-by: Aidan Delaney --- builders/alpine/builder.toml | 4 ++-- builders/jammy/builder.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builders/alpine/builder.toml b/builders/alpine/builder.toml index cab57194..0dcc219a 100644 --- a/builders/alpine/builder.toml +++ b/builders/alpine/builder.toml @@ -1,12 +1,12 @@ # Buildpacks to include in builder [[buildpacks]] id = "samples/java-maven" -version = "0.0.1" +version = "0.0.2" uri = "../../buildpacks/java-maven" [[buildpacks]] id = "samples/kotlin-gradle" -version = "0.0.1" +version = "0.0.2" uri = "../../buildpacks/kotlin-gradle" [[buildpacks]] diff --git a/builders/jammy/builder.toml b/builders/jammy/builder.toml index ace8c2ca..21ccaaff 100644 --- a/builders/jammy/builder.toml +++ b/builders/jammy/builder.toml @@ -1,12 +1,12 @@ # Buildpacks to include in builder [[buildpacks]] id = "samples/java-maven" -version = "0.0.1" +version = "0.0.2" uri = "../../buildpacks/java-maven" [[buildpacks]] id = "samples/kotlin-gradle" -version = "0.0.1" +version = "0.0.2" uri = "../../buildpacks/kotlin-gradle" [[buildpacks]]