Buildpacks
/
samples
mirror of https://github.com/buildpacks/samples.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Migrate java and kotlin to exec.d
This commit is contained in:
Aidan Delaney 2023-10-17 00:29:17 +01:00 committed by GitHub
parent 3f7a95d885 7917059795
commit cab5c170d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builders/alpine/builder.toml
View File

@ -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]]

8
builders/jammy/builder.toml
View File

@ -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]]

10
buildpacks/java-maven/bin/build
View File

@ -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

2
buildpacks/java-maven/buildpack.toml
View File

@ -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"

10
buildpacks/kotlin-gradle/bin/build
View File

@ -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

2
buildpacks/kotlin-gradle/buildpack.toml
View File

@ -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"