From 663012234034aa1dee056cc81b9131a604f1f8f9 Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Wed, 2 Jun 2021 11:26:47 -0400 Subject: [PATCH] Bump the lifecycle to 0.6, add description, keywords and license metadata and make running 'upx' optional, default off in build script, and sets web as the default process type --- buildpack.toml | 8 +++++++- native/build.go | 2 +- native/build_test.go | 4 ++-- scripts/build.sh | 9 +++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/buildpack.toml b/buildpack.toml index 7821b8c..1f0f3ac 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -12,13 +12,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -api = "0.5" +api = "0.6" [buildpack] id = "paketo-buildpacks/native-image" name = "Paketo Native Image Buildpack" version = "{{.version}}" homepage = "https://github.com/paketo-buildpacks/native-image" +description = "A Cloud Native Buildpack that creates native images from Java applications" +keywords = ["java", "native-image", "spring-boot"] + +[[buildpack.licenses]] +type = "Apache-2.0" +uri = "https://github.com/paketo-buildpacks/native-image/blob/main/LICENSE" [[stacks]] id = "io.buildpacks.stacks.bionic" diff --git a/native/build.go b/native/build.go index f710a17..77c0a96 100644 --- a/native/build.go +++ b/native/build.go @@ -82,7 +82,7 @@ func (b Build) Build(context libcnb.BuildContext) (libcnb.BuildResult, error) { result.Processes = append(result.Processes, libcnb.Process{Type: "native-image", Command: command, Direct: true}, libcnb.Process{Type: "task", Command: command, Direct: true}, - libcnb.Process{Type: "web", Command: command, Direct: true}, + libcnb.Process{Type: "web", Command: command, Direct: true, Default: true}, ) return result, nil diff --git a/native/build_test.go b/native/build_test.go index 9b5038d..dee5cfb 100644 --- a/native/build_test.go +++ b/native/build_test.go @@ -88,7 +88,7 @@ Start-Class: test-start-class Expect(result.Processes).To(ContainElements( libcnb.Process{Type: "native-image", Command: filepath.Join(ctx.Application.Path, "test-start-class"), Direct: true}, libcnb.Process{Type: "task", Command: filepath.Join(ctx.Application.Path, "test-start-class"), Direct: true}, - libcnb.Process{Type: "web", Command: filepath.Join(ctx.Application.Path, "test-start-class"), Direct: true}, + libcnb.Process{Type: "web", Command: filepath.Join(ctx.Application.Path, "test-start-class"), Direct: true, Default: true}, )) }) @@ -118,7 +118,7 @@ Start-Class: test-start-class Expect(result.Processes).To(ContainElements( libcnb.Process{Type: "native-image", Command: filepath.Join(ctx.Application.Path, "test-start-class"), Direct: true}, libcnb.Process{Type: "task", Command: filepath.Join(ctx.Application.Path, "test-start-class"), Direct: true}, - libcnb.Process{Type: "web", Command: filepath.Join(ctx.Application.Path, "test-start-class"), Direct: true}, + libcnb.Process{Type: "web", Command: filepath.Join(ctx.Application.Path, "test-start-class"), Direct: true, Default: true}, )) Expect(out.String()).To(ContainSubstring("$BP_BOOT_NATIVE_IMAGE has been deprecated. Please use $BP_NATIVE_IMAGE instead.")) diff --git a/scripts/build.sh b/scripts/build.sh index ebadacb..9c51aaa 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -4,8 +4,13 @@ set -euo pipefail GOOS="linux" go build -ldflags='-s -w' -o bin/main github.com/paketo-buildpacks/native-image/cmd/main -strip bin/main -upx -q -9 bin/main +if [ "${STRIP:-false}" != "false" ]; then + strip bin/main +fi + +if [ "${COMPRESS:-false}" != "false" ]; then + upx -q -9 bin/main +fi ln -fs main bin/build ln -fs main bin/detect