chore(pack-images): upgrade buildpack version

duanhongyi · duanhongyi · commit 1bd3548ccda4 · 2023-06-02T13:07:23.000+08:00
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -16,4 +16,7 @@ RUN cp -rf /var/lib/dpkg /var/lib/dpkg-run; \
   mv /var/lib/dpkg-run /var/lib/dpkg;
 ADD rootfs /
 
-USER ${CNB_USER_ID}:${CNB_GROUP_ID}
+ARG PLATFORM_API
+RUN sed -i "s/{{CNB_PLATFORM_API}}/${PLATFORM_API}/g" /usr/local/bin/generate-layers.sh
+
+USER ${CNB_USER_ID}:${CNB_GROUP_ID}
diff --git a/Makefile b/Makefile
@@ -4,7 +4,8 @@ DEV_REGISTRY ?= registry.drycc.cc
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 PLATFORM ?= $(shell python3 _scripts/utils.py platform)
 ARCH ?= $(shell python3 _scripts/utils.py arch)
-LIFECYCLE_VERSION ?= v0.15.3
+PLATFORM_API ?= 0.11
+LIFECYCLE_VERSION ?= v0.16.3
 ifeq ($(ARCH),amd64)
 LIFECYCLE_URL = https://github.com/buildpacks/lifecycle/releases/download/$(LIFECYCLE_VERSION)/lifecycle-${LIFECYCLE_VERSION}+linux.x86-64.tgz
 else
@@ -27,6 +28,7 @@ pack:
 	  -t ${STACK_RUN_IMAGE} .
 	@docker build -f Dockerfile.build \
 	  --build-arg BASE_IMAGE=${STACK_RUN_IMAGE} \
+	  --build-arg PLATFORM_API=${PLATFORM_API} \
 	  -t ${STACK_BUILD_IMAGE} .
 
 publish-pack: pack
diff --git a/buildpacks/go/buildpack.toml b/buildpacks/go/buildpack.toml
@@ -1,5 +1,5 @@
 # Buildpack API version
-api = "0.8"
+api = "0.9"
 
 # Buildpack ID and metadata
 [buildpack]
diff --git a/buildpacks/java/buildpack.toml b/buildpacks/java/buildpack.toml
@@ -1,5 +1,5 @@
 # Buildpack API version
-api = "0.8"
+api = "0.9"
 
 # Buildpack ID and metadata
 [buildpack]
diff --git a/buildpacks/node/buildpack.toml b/buildpacks/node/buildpack.toml
@@ -1,5 +1,5 @@
 # Buildpack API version
-api = "0.8"
+api = "0.9"
 
 # Buildpack ID and metadata
 [buildpack]
diff --git a/buildpacks/php/buildpack.toml b/buildpacks/php/buildpack.toml
@@ -1,5 +1,5 @@
 # Buildpack API version
-api = "0.8"
+api = "0.9"
 
 # Buildpack ID and metadata
 [buildpack]
diff --git a/buildpacks/python/buildpack.toml b/buildpacks/python/buildpack.toml
@@ -1,5 +1,5 @@
 # Buildpack API version
-api = "0.8"
+api = "0.9"
 
 # Buildpack ID and metadata
 [buildpack]
diff --git a/buildpacks/ruby/bin/build b/buildpacks/ruby/bin/build
@@ -17,8 +17,6 @@ generate_deps_layer run-deps
 
 # 3. install ruby
 generate_stack_layer ruby "${plan_path}" true
-# shellcheck source=/dev/null
-. init-stack
 
 # Compares previous Gemfile.lock checksum to the current Gemfile.lock
 bundler_layer_dir="${layers_dir}/bundler"
@@ -27,6 +25,10 @@ remote_bundler_checksum="not found"
 if [[ -f "${bundler_layer_dir}.toml" ]]; then
   remote_bundler_checksum=$(yj <"${bundler_layer_dir}.toml" -t | jq -r .metadata.version 2>/dev/null || echo 'not found')
 fi
+mkdir -p "${bundler_layer_dir}/profile.d"
+echo "export BUNDLE_APP_CONFIG=${bundler_layer_dir}" > "${bundler_layer_dir}/profile.d/bundle.sh"
+# shellcheck source=/dev/null
+. init-stack
 
 mkdir -p "${bundler_layer_dir}/bin"
 bundle config --local path "${bundler_layer_dir}" >/dev/null
diff --git a/buildpacks/ruby/buildpack.toml b/buildpacks/ruby/buildpack.toml
@@ -1,5 +1,5 @@
 # Buildpack API version
-api = "0.8"
+api = "0.9"
 
 # Buildpack ID and metadata
 [buildpack]
diff --git a/buildpacks/rust/buildpack.toml b/buildpacks/rust/buildpack.toml
@@ -1,5 +1,5 @@
 # Buildpack API version
-api = "0.8"
+api = "0.9"
 
 # Buildpack ID and metadata
 [buildpack]
diff --git a/rootfs/usr/local/bin/generate-launch.sh b/rootfs/usr/local/bin/generate-launch.sh
@@ -7,22 +7,19 @@ layers_dir=$1
 function procfile_to_launch() {
   procfile=$(< Procfile yj -yj)
   for key in $(echo "${procfile}" | jq -r "to_entries | .[] | .key"); do
-    default="false"
-    if [[ "${key}" == "web" ]] ; then
-      default="true"
-    fi
     cat >> "${layers_dir}/launch.toml" <<EOL
-  [[processes]]
+[[processes]]
   type = "${key}"
-  command = "$(echo "$procfile" | jq -r ".$key")"
-  direct = false
-  default = ${default}
+  command = ["launcher"]
+  args = ["$(echo "$procfile" | jq -r ".$key" | sed 's/ /", "/g')"]
+
 EOL
   done
 }
 
 
 if [[ -f Procfile ]]; then
+  rm -rf "${layers_dir}/launch.toml"
   procfile_to_launch
 elif [[ -f launch.toml ]]; then
   cp launch.toml "${layers_dir}/launch.toml"
diff --git a/rootfs/usr/local/bin/generate-layers.sh b/rootfs/usr/local/bin/generate-layers.sh
@@ -52,6 +52,13 @@ EOL
 
 generate_base_layer() {
     BASE_LAYER="${layers_dir}"/base
+    mkdir -p "${BASE_LAYER}/bin"
+    cat > "${BASE_LAYER}/bin/launcher" <<EOL
+#!/usr/bin/env bash
+export CNB_PLATFORM_API={{CNB_PLATFORM_API}}
+exec tini -g -- /cnb/lifecycle/launcher \$@
+EOL
+    chmod +x "${BASE_LAYER}/bin/launcher"
     mkdir -p "${BASE_LAYER}/deps"
     if [ -e .build-deps ]; then
         cp .build-deps "${BASE_LAYER}/deps"
@@ -61,10 +68,10 @@ generate_base_layer() {
     fi
     mkdir -p "${BASE_LAYER}/profile.d" 
     cat > "${BASE_LAYER}/profile.d/link.sh" <<EOL
-    rm -rf /opt/drycc
-    ln -s "${layers_dir}" /opt/drycc
-    echo "include ${layers_dir}/*/etc/ld.so.conf.d/*.conf" > /etc/ld.so.conf.d/drycc.conf
-    ldconfig
+rm -rf /opt/drycc
+ln -s "${layers_dir}" /opt/drycc
+echo "include ${layers_dir}/*/etc/ld.so.conf.d/*.conf" > /etc/ld.so.conf.d/drycc.conf
+ldconfig
 EOL
     bash "${BASE_LAYER}/profile.d/link.sh"
     cat > "${BASE_LAYER}.toml" <<EOL
