Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate java and kotlin to exec.d #159

Merged
merged 9 commits into from
Oct 16, 2023
Merged

Migrate java and kotlin to exec.d #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
09460d9
Migrate java and kotlin to exec.d
AidanDelaney Jul 17, 2023
fd3c468
fixup! Migrate java and kotlin to exec.d
AidanDelaney Jul 17, 2023
d06a47d
Merge branch 'main' into migrate-to-exec.d
AidanDelaney Jul 26, 2023
74fd545
Merge branch 'main' into migrate-to-exec.d
AidanDelaney Jul 28, 2023
6991fce
Merge branch 'main' into migrate-to-exec.d
AidanDelaney Aug 30, 2023
b29a1e6
Merge branch 'main' into migrate-to-exec.d
AidanDelaney Sep 12, 2023
b3f552b
Merge branch 'main' into migrate-to-exec.d
AidanDelaney Sep 25, 2023
84dd7dc
Merge branch 'main' into migrate-to-exec.d
AidanDelaney Oct 4, 2023
7917059
Merge branch 'main' into migrate-to-exec.d
jkutner Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions builders/alpine/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]]
Expand Down Expand Up @@ -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]]
Expand Down
8 changes: 4 additions & 4 deletions builders/jammy/builder.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]]
Expand All @@ -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]]
Expand Down
10 changes: 5 additions & 5 deletions buildpacks/java-maven/bin/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion buildpacks/java-maven/buildpack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
10 changes: 5 additions & 5 deletions buildpacks/kotlin-gradle/bin/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion buildpacks/kotlin-gradle/buildpack.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down