Merge pull request #159 from buildpacks/migrate-to-exec.d

Migrate java and kotlin to exec.d
buildpacks · Oct 16, 2023 · cab5c17 · cab5c17
2 parents 3f7a95d + 7917059
commit cab5c17
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git 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]]
@@ -42,12 +42,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
@@ -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]]
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"