Upgrade lifecycle, buildpack api and libcnb to latest version (#32)

- Upgrade lifecycle from 0.11.1 to 0.13.2 - Upgrade buildpack api from 0.2 to 0.7 - Upgrade libcnb from v1.15.2 to v1.25.4 Signed-off-by: Benjamin Huo <benjamin@kubesphere.io>
OpenFunction · Jan 21, 2022 · fdc6aba · fdc6aba
1 parent 4bd5a48
commit fdc6aba
Show file tree

Hide file tree

Showing 88 changed files with 143 additions and 104 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -217,8 +217,8 @@ maven_install(
 go_repository(
     name = "com_github_buildpacks_libcnb",
     importpath = "github.com/buildpacks/libcnb",
-    sum = "h1:f1b2LGqc0PXBSMHJyGFDepDn13YtiiXx2/JewQp9HWw=",
-    version = "v1.15.2",
+    sum = "h1:qI+dbgLFgaGcafNFDlZC/JGpSHI2Jfx99TiVQPQedgo=",
+    version = "v1.25.4",
 )
 
 go_repository(

diff --git a/builders/base/builder.toml b/builders/base/builder.toml
@@ -472,4 +472,4 @@ description = "Ubuntu 18 base image with buildpacks for .NET, Go, Java, Node.js,
   run-image = "gcr.io/buildpacks/gcp/run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/base/stack/parent.Dockerfile b/builders/base/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/go115/builder.toml b/builders/go115/builder.toml
@@ -51,4 +51,4 @@ description = "Ubuntu 18 base image with buildpacks for .NET, Go, Java, Node.js,
   run-image = "openfunctiondev/buildpacks-go115-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/go115/stack/parent.Dockerfile b/builders/go115/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/go116/BUILD.bazel b/builders/go116/BUILD.bazel
@@ -15,7 +15,7 @@ builder(
             "//cmd/go/of_functions_framework:of_functions_framework.tgz",
         ],
     },
-    image = "openfunction/builder-go",
+    image = "openfunction/builder-go:v2",
     visibility = [
         "//builders/go116/acceptance:__pkg__",
     ],

diff --git a/builders/go116/README.md b/builders/go116/README.md
@@ -17,8 +17,8 @@ bazel run //builders/go116/stack:build
 This command creates two images:
 
 ```shell
-openfunctiondev/buildpacks-run-go:v1
-openfunctiondev/buildpacks-go116-build:v1
+openfunctiondev/buildpacks-run-go:v2
+openfunctiondev/buildpacks-go116-build:v2
 ```
 
 ## Build go116 builder

diff --git a/builders/go116/builder.toml b/builders/go116/builder.toml
@@ -47,8 +47,8 @@ description = "Ubuntu 18 base image with buildpacks for .NET, Go, Java, Node.js,
 # Currently built with //builders/go116/stack/stack:build.
 [stack]
   id = "openfunction.go116"
-  build-image = "openfunctiondev/buildpacks-go116-build:v1"
-  run-image = "openfunctiondev/buildpacks-run-go:v1"
+  build-image = "openfunctiondev/buildpacks-go116-build:v2"
+  run-image = "openfunctiondev/buildpacks-run-go:v2"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/go116/stack/BUILD.bazel b/builders/go116/stack/BUILD.bazel
@@ -10,7 +10,8 @@ sh_binary(
     data = [
         "build.Dockerfile",
         "parent.Dockerfile",
-        "run.parent.Dockerfile",
+        "run.busybox.Dockerfile",
+        "run.distroless.Dockerfile",
         "run.Dockerfile",
         "//licenses:licenses.tar",
     ],

diff --git a/builders/go116/stack/build.sh b/builders/go116/stack/build.sh
@@ -31,7 +31,7 @@ set -euo pipefail
 DIR="$(dirname "$1")"
 LICENSES="$2"
 
-TAG="v1"
+TAG="v2"
 
 # Extract licenses.tar because it is symlinked, which Docker does not support.
 readonly TEMP="$(mktemp -d)"
@@ -44,7 +44,7 @@ tar xf "$LICENSES" -C "$TEMP/licenses"
 echo "> Building base go116common image"
 docker build -t "go116common" - < "${DIR}/parent.Dockerfile"
 echo "> Building base go116run image"
-docker build -t "go116run" - < "${DIR}/run.parent.Dockerfile"
+docker build -t "go116run" - < "${DIR}/run.busybox.Dockerfile"
 echo "> Building openfunctiondev/buildpacks-run-go:$TAG"
 docker build --build-arg "from_image=go116run" -t "openfunctiondev/buildpacks-run-go:$TAG" - < "${DIR}/run.Dockerfile"
 echo "> Building openfunctiondev/buildpacks-go116-build:$TAG"

diff --git a/builders/go116/stack/parent.Dockerfile b/builders/go116/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000
@@ -35,7 +35,7 @@ LABEL io.buildpacks.stack.id=${stack_id}
 RUN groupadd cnb --gid ${cnb_gid} && \
   useradd --uid ${cnb_uid} --gid ${cnb_gid} -m -s /bin/bash cnb
 
-RUN curl --fail --show-error --silent --location --retry 3 https://golang.org/dl/go1.16.linux-amd64.tar.gz | tar xz --directory /usr/local/ --strip-components=1
+RUN curl --fail --show-error --silent --location --retry 3 https://go.dev/dl/go1.16.13.linux-amd64.tar.gz | tar xz --directory /usr/local/ --strip-components=1
 
 ENV CNB_USER_ID=${cnb_uid}
 ENV CNB_GROUP_ID=${cnb_gid}

diff --git a/builders/go116/stack/run.Dockerfile b/builders/go116/stack/run.Dockerfile
@@ -16,4 +16,4 @@ ARG from_image
 FROM ${from_image}
 
 ENV PORT 8080
-USER nonroot
+USER cnb
diff --git a/...go116/stack/run.busybox.parent.Dockerfile → builders/go116/stack/run.busybox.Dockerfile b/...go116/stack/run.busybox.parent.Dockerfile → builders/go116/stack/run.busybox.Dockerfile
diff --git a/builders/go116/stack/run.parent.Dockerfile → ...ers/go116/stack/run.distroless.Dockerfile b/builders/go116/stack/run.parent.Dockerfile → ...ers/go116/stack/run.distroless.Dockerfile
diff --git a/builders/java11/builder.toml b/builders/java11/builder.toml
@@ -141,4 +141,4 @@ description = "Ubuntu 18 base image with buildpacks for Nodejs"
   run-image = "openfunctiondev/buildpacks-java11-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/java11/stack/parent.Dockerfile b/builders/java11/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/node10/builder.toml b/builders/node10/builder.toml
@@ -80,4 +80,4 @@ description = "Ubuntu 18 base image with buildpacks for Nodejs"
   run-image = "openfunctiondev/buildpacks-node10-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/node10/stack/parent.Dockerfile b/builders/node10/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/node12/builder.toml b/builders/node12/builder.toml
@@ -80,4 +80,4 @@ description = "Ubuntu 18 base image with buildpacks for Nodejs"
   run-image = "openfunctiondev/buildpacks-node12-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/node12/stack/parent.Dockerfile b/builders/node12/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/node14/builder.toml b/builders/node14/builder.toml
@@ -80,4 +80,4 @@ description = "Ubuntu 18 base image with buildpacks for Nodejs"
   run-image = "openfunctiondev/buildpacks-node14-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/node14/stack/parent.Dockerfile b/builders/node14/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/node16/builder.toml b/builders/node16/builder.toml
@@ -80,4 +80,4 @@ description = "Ubuntu 18 base image with buildpacks for Nodejs"
   run-image = "openfunctiondev/buildpacks-node16-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/node16/stack/parent.Dockerfile b/builders/node16/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/py37/builder.toml b/builders/py37/builder.toml
@@ -61,4 +61,4 @@ description = "Ubuntu 18 base image with buildpacks for Python"
   run-image = "openfunctiondev/buildpacks-py37-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/py37/stack/parent.Dockerfile b/builders/py37/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/py38/builder.toml b/builders/py38/builder.toml
@@ -61,4 +61,4 @@ description = "Ubuntu 18 base image with buildpacks for Python"
   run-image = "openfunctiondev/buildpacks-py38-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/py38/stack/parent.Dockerfile b/builders/py38/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/py39/builder.toml b/builders/py39/builder.toml
@@ -61,4 +61,4 @@ description = "Ubuntu 18 base image with buildpacks for Python"
   run-image = "openfunctiondev/buildpacks-py39-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/py39/stack/parent.Dockerfile b/builders/py39/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/builders/ruby26/builder.toml b/builders/ruby26/builder.toml
@@ -36,4 +36,4 @@ description = "Builder for the GCF Ruby 2.6 runtime"
   run-image = "openfunctiondev/buildpacks-ruby26-run:v1"
 
 [lifecycle]
-  version = "0.11.1"
+  version = "0.13.2"
diff --git a/builders/ruby26/stack/parent.Dockerfile b/builders/ruby26/stack/parent.Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/gcp-runtimes/ubuntu_18_0_4
+FROM openfunctiondev/ubuntu_18_0_4
 
 ARG cnb_uid=1000
 ARG cnb_gid=1000

diff --git a/cmd/config/entrypoint/buildpack.toml b/cmd/config/entrypoint/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.config.entrypoint"

diff --git a/cmd/cpp/clear_source/buildpack.toml b/cmd/cpp/clear_source/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.cpp.clear_source"

diff --git a/cmd/cpp/functions_framework/buildpack.toml b/cmd/cpp/functions_framework/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.cpp.functions-framework"

diff --git a/cmd/dotnet/appengine/buildpack.toml b/cmd/dotnet/appengine/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.dotnet.appengine"

diff --git a/cmd/dotnet/appengine_main/buildpack.toml b/cmd/dotnet/appengine_main/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.dotnet.appengine_main"

diff --git a/cmd/dotnet/functions_framework/buildpack.toml b/cmd/dotnet/functions_framework/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.dotnet.functions-framework"

diff --git a/cmd/dotnet/publish/buildpack.toml b/cmd/dotnet/publish/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.dotnet.publish"

diff --git a/cmd/dotnet/runtime/buildpack.toml b/cmd/dotnet/runtime/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.dotnet.runtime"

diff --git a/cmd/dotnet/runtime/main.go b/cmd/dotnet/runtime/main.go
@@ -107,10 +107,10 @@ func buildFn(ctx *gcp.Context) error {
 	ctx.SetMetadata(sdkl, versionKey, version)
 	ctx.SetMetadata(rtl, versionKey, version)
 	rtl.SharedEnvironment.Default("DOTNET_ROOT", rtl.Path)
-	rtl.SharedEnvironment.PrependPath("PATH", rtl.Path)
+	rtl.SharedEnvironment.Default("PATH", rtl.Path)
 	rtl.LaunchEnvironment.Default("DOTNET_RUNNING_IN_CONTAINER", "true")
 
-	ctx.AddBuildpackPlanEntry(libcnb.BuildpackPlanEntry{
+	ctx.AddBOMEntry(libcnb.BOMEntry{
 		Name:     runtimeLayer,
 		Metadata: map[string]interface{}{"version": version},
 	})

diff --git a/cmd/go/build/buildpack.toml b/cmd/go/build/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.go.build"
@@ -12,4 +12,4 @@ id = "google"
 id = "openfunction.go115"
 
 [[stacks]]
-id = "openfunction.go116"
+id = "openfunction.go116"
diff --git a/cmd/go/build/main.go b/cmd/go/build/main.go
@@ -54,7 +54,7 @@ func buildFn(ctx *gcp.Context) error {
 	// Create a layer for the compiled binary.  Add it to PATH in case
 	// users wish to invoke the binary manually.
 	bl := ctx.Layer("bin", gcp.LaunchLayer)
-	bl.LaunchEnvironment.PrependPath("PATH", bl.Path)
+	bl.LaunchEnvironment.Default("PATH", bl.Path)
 	outBin := filepath.Join(bl.Path, golang.OutBin)
 
 	buildable, err := goBuildable(ctx)
@@ -74,10 +74,12 @@ func buildFn(ctx *gcp.Context) error {
 	}
 	golang.ExecWithGoproxyFallback(ctx, bld, gcp.WithEnv("GOCACHE="+cl.Path, "CGO_ENABLED=0"), gcp.WithWorkDir(workdir), gcp.WithMessageProducer(printTipsAndKeepStderrTail(ctx)), gcp.WithUserAttribution)
 
+	// Set the default process type
+	ctx.SetMetadata(bl, "buildpack-default-process-type", "web")
 	// Configure the entrypoint for production. Use the full path to save `skaffold debug`
 	// from fetching the remote container image (tens to hundreds of megabytes), which is slow.
 	if !devmode.Enabled(ctx) {
-		ctx.AddWebProcess([]string{outBin})
+		ctx.AddDefaultWebProcess([]string{outBin}, true)
 		return nil
 	}
 

diff --git a/cmd/go/clear_source/buildpack.toml b/cmd/go/clear_source/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.go.clear_source"
@@ -12,4 +12,4 @@ id = "google"
 id = "openfunction.go115"
 
 [[stacks]]
-id = "openfunction.go116"
+id = "openfunction.go116"
diff --git a/cmd/go/functions_framework/buildpack.toml b/cmd/go/functions_framework/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "google.go.functions-framework"

diff --git a/cmd/go/of_functions_framework/buildpack.toml b/cmd/go/of_functions_framework/buildpack.toml
@@ -1,4 +1,4 @@
-api = "0.2"
+api = "0.7"
 
 [buildpack]
 id = "openfunction.go.of-functions-framework"
@@ -12,4 +12,4 @@ id = "google"
 id = "openfunction.go115"
 
 [[stacks]]
-id = "openfunction.go116"
+id = "openfunction.go116"