chore(pack-images): upgrade to new lifecycle

Author: duanhongyi

Makefile

@@ -4,21 +4,39 @@ VERSION ?= ${STACK}
 DEV_REGISTRY ?= docker.io
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 
+ARCH ?= $(shell python3 _scripts/utils.py arch)
+LIFECYCLE_VERSION ?= v0.12.0-rc.1
+ifeq ($(ARCH),amd64)
+LIFECYCLE_URL = https://github.com/buildpacks/lifecycle/releases/download/$(LIFECYCLE_VERSION)/lifecycle-${LIFECYCLE_VERSION}+linux.x86-64.tgz
+else
+LIFECYCLE_URL = https://github.com/buildpacks/lifecycle/releases/download/$(LIFECYCLE_VERSION)/lifecycle-${LIFECYCLE_VERSION}+linux.${ARCH}.tgz
+endif
+STACK_RUN_IMAGE = docker.io/drycc/pack:20-linux-${ARCH}
+STACK_BUILD_IMAGE = docker.io/drycc/pack:20-linux-${ARCH}-build
+
 SHELLCHECK_PREFIX := docker run --rm -v ${CURDIR}:/workdir -w /workdir ${DRYCC_REGISTRY}/drycc/go-dev shellcheck
 SHELL_SCRIPTS = $(shell find "buildpacks" -name '*.sh') $(shell find "rootfs" -name '*.sh') $(wildcard buildpacks/*/bin/*)
 
 SHELL=/bin/bash -o pipefail
 
 pack:
-	@docker build --pull -f Dockerfile.build --build-arg STACK=drycc-${STACK} --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/stack-images:${STACK}-build -t ${DRYCC_REGISTRY}/drycc/pack:${VERSION}-build .
-	@docker build --pull -f Dockerfile.run --build-arg STACK=drycc-${STACK} --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/stack-images:${STACK} -t ${DRYCC_REGISTRY}/drycc/pack:${VERSION} .
+	@docker build --pull -f Dockerfile.build \
+	  --build-arg STACK=drycc-${STACK} \
+	  --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/stack-images:${STACK}-build \
+	  -t ${DRYCC_REGISTRY}/drycc/pack:${VERSION}-build .
+	@docker build --pull -f Dockerfile.run \
+	  --build-arg STACK=drycc-${STACK} \
+	  --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/stack-images:${STACK} \
+	  -t ${DRYCC_REGISTRY}/drycc/pack:${VERSION} .
 
 publish-pack: pack
 	@docker push ${DRYCC_REGISTRY}/drycc/pack:${VERSION}-build
 	@docker push ${DRYCC_REGISTRY}/drycc/pack:${VERSION}
 
 buildpack:
-	@pack builder create ${DRYCC_REGISTRY}/drycc/buildpacks:${VERSION} --config builder.toml --pull-policy if-not-present
+	LIFECYCLE_URL=${LIFECYCLE_URL} STACK_RUN_IMAGE=${STACK_RUN_IMAGE} STACK_BUILD_IMAGE=${STACK_BUILD_IMAGE} python3 _scripts/utils.py toml builder.toml builder.toml.${ARCH}
+	@pack builder create ${DRYCC_REGISTRY}/drycc/buildpacks:${VERSION} --config builder.toml.${ARCH} --pull-policy if-not-present
+	@rm -rf builder.toml.${ARCH}
 
 publish-buildpack: buildpack
 	@docker push ${DRYCC_REGISTRY}/drycc/buildpacks:${VERSION}

_scripts/utils.py

@@ -0,0 +1,25 @@
+import os
+import sys
+import platform
+
+def toml():
+    result = None
+    with open(sys.argv[2]) as f:
+        tpl = f.read()
+        result = tpl.format(**os.environ)
+    with open(sys.argv[3], "w") as f:
+        f.write(result)
+
+def arch():
+    print({
+        "armv5": "armv5",
+        "armv6": "armv6",
+        "aarch64": "arm64",
+        "x86": "386",
+        "x86_64": "amd64",
+        "i686": "386",
+        "i386": "386",
+    }.get(platform.machine()))
+
+if __name__ == "__main__":
+    eval("%s()" % sys.argv[1])

builder.toml

@@ -1,7 +1,7 @@
 description = "Base builder for 20 stack, based on ubuntu:20.04 base image"
 
 [lifecycle]
-version = "0.11.3"
+uri = "{LIFECYCLE_URL}"
 
 [[buildpacks]]
   id = "drycc/ruby"
@@ -77,5 +77,5 @@ version = "0.0.1"
 
 [stack]
 id = "drycc-20"
-build-image = "docker.io/drycc/pack:20-build"
-run-image = "docker.io/drycc/pack:20"
+run-image = "{STACK_RUN_IMAGE}"
+build-image = "{STACK_BUILD_IMAGE}"