chore(pack-images): add codename build-arg

Author: duanhongyi

.gitignore

@@ -1,3 +1,5 @@
 .idea
 *.iml
 .tools
+build.toml.*.*
+buildpacks/*/buildpack.toml

.woodpecker/build-linux-buildpacks.yml

@@ -24,9 +24,8 @@ pipeline:
   - sed -i "s/{{CODENAME}}/$${CODENAME}/g" builder.toml
   - export PACK_HOME=$CI_WORKSPACE
   - make publish-buildpack
-  environment:
-    CODENAME: bookworm
   secrets:
+  - codename
   - dev_registry
   - drycc_registry
   - container_username

.woodpecker/build-linux-pack.yml

@@ -13,8 +13,9 @@ pipeline:
   image: bash
   commands:
   - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
-  - CODENAME=bookworm make publish-pack
+  - make publish-pack
   secrets:
+  - codename
   - dev_registry
   - drycc_registry
   - container_username

.woodpecker/manifest-buildpacks.yml

@@ -8,10 +8,9 @@ pipeline:
   image: bash
   commands:
   - sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest-buildpacks.tmpl
-  - sed -i "s/{{codename}}/bookworm/g" .woodpecker/manifest-buildpacks.tmpl
-  environment:
-    CODENAME: bookworm
+  - sed -i "s/{{codename}}/$${CODENAME}/g" .woodpecker/manifest-buildpacks.tmpl
   secrets:
+  - codename
   - dev_registry
   - drycc_registry
   - container_username

.woodpecker/manifest-pack.yml

@@ -11,9 +11,8 @@ pipeline:
   - sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest-build.tmpl
   - sed -i "s/{{codename}}/$${CODENAME}/g" .woodpecker/manifest-run.tmpl
   - sed -i "s/{{codename}}/$${CODENAME}/g" .woodpecker/manifest-build.tmpl
-  environment:
-    CODENAME: bookworm
   secrets:
+  - codename
   - dev_registry
   - drycc_registry
   - container_username

.woodpecker/test-linux.yml

@@ -12,10 +12,9 @@ pipeline:
 - name: test-linux
   image: bash
   commands:
-  - CODENAME=$${CODENAME} make test-style
-  environment:
-    CODENAME: bookworm
+  - make test-style
   secrets:
+  - codename
   - dev_registry
   - codecov_token
   - drycc_registry

Makefile

@@ -1,5 +1,4 @@
 # If DRYCC_REGISTRY is not set, try to populate it from legacy DEV_REGISTRY
-CODENAME ?= bookworm
 DEV_REGISTRY ?= registry.drycc.cc
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 PLATFORM ?= $(shell python3 _scripts/utils.py platform)
@@ -36,9 +35,16 @@ publish-pack: pack
 	@docker push ${STACK_BUILD_IMAGE}
 
 buildpack:
+	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/go/buildpack.tmpl buildpacks/go/buildpack.toml
+	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/java/buildpack.tmpl buildpacks/java/buildpack.toml
+	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/node/buildpack.tmpl buildpacks/node/buildpack.toml
+	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/php/buildpack.tmpl buildpacks/php/buildpack.toml
+	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/python/buildpack.tmpl buildpacks/python/buildpack.toml
+	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/ruby/buildpack.tmpl buildpacks/ruby/buildpack.toml
+	STACK_ID=${STACK_ID} python3 _scripts/utils.py toml buildpacks/rust/buildpack.tmpl buildpacks/rust/buildpack.toml
 	STACK_ID=${STACK_ID} 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.${PLATFORM}.${ARCH}
 	@pack builder create ${BUILDPACKS_IMAGE} --config builder.toml.${PLATFORM}.${ARCH} --pull-policy if-not-present
-	@rm -rf builder.toml.${PLATFORM}.${ARCH}
+	@rm -rf builder.toml.${PLATFORM}.${ARCH} buildpacks/*/buildpack.toml
 
 publish-buildpack: buildpack
 	@docker push ${BUILDPACKS_IMAGE}

README.md

@@ -6,36 +6,36 @@ This repository is responsible for building and publishing images that builds
 with [Cloud Native Buildpacks'](https://buildpacks.io)
 [`pack`](https://github.com/buildpacks/pack) command.
 
-* [drycc/pack:bookworm](https://hub.docker.com/r/drycc/pack/tags/) - A CNB
-  compatible run image based on drycc/pack:bookworm
-* [drycc/pack:bookworm-build](https://hub.docker.com/r/drycc/pack/tags/) - A CNB
-  compatible build image based on drycc/pack:bookworm-build
+* [drycc/pack:codename](https://hub.docker.com/r/drycc/pack/tags/) - A CNB
+  compatible run image based on drycc/pack:codename
+* [drycc/pack:codename-build](https://hub.docker.com/r/drycc/pack/tags/) - A CNB
+  compatible build image based on drycc/pack:codename-build
 
 ## Usage
 
-`pack build myapp --builder drycc/buildpacks:bookworm`
+`pack build myapp --builder drycc/buildpacks:codename`
 
 ## System
 
 The basic image is based on Debian system, See the table below for system description：
 
 STACK ID        | Buildpacks image                            | Operating System
 ----------------|---------------------------------------------|---------------------------------
-drycc-bookworm  | registry.drycc.cc/drycc/buildpacks:bookworm | Debian 11 bookworm 
+drycc-codename  | registry.drycc.cc/drycc/buildpacks:codename | Debian 11 codename 
 
 The basic layer of buildpack supports custom software sources and custom software.
 For example, if we use alicloud to install libpq-dev, we can add `.deb-list` and `·source-list` files to the project.
 
 ```
 cat > ".source-list" <<EOL
-deb http://mirrors.cloud.aliyuncs.com/debian/ bookworm main non-free contrib
-deb-src http://mirrors.cloud.aliyuncs.com/debian/ bookworm main non-free contrib
-deb http://mirrors.cloud.aliyuncs.com/debian-security bookworm/updates main
-deb-src http://mirrors.cloud.aliyuncs.com/debian-security bookworm/updates main
-deb http://mirrors.cloud.aliyuncs.com/debian/ bookworm-updates main non-free contrib
-deb-src http://mirrors.cloud.aliyuncs.com/debian/ bookworm-updates main non-free contrib
-deb http://mirrors.cloud.aliyuncs.com/debian/ bookworm-backports main non-free contrib
-deb-src http://mirrors.cloud.aliyuncs.com/debian/ bookworm-backports main non-free contrib
+deb http://mirrors.cloud.aliyuncs.com/debian/ codename main non-free contrib
+deb-src http://mirrors.cloud.aliyuncs.com/debian/ codename main non-free contrib
+deb http://mirrors.cloud.aliyuncs.com/debian-security codename/updates main
+deb-src http://mirrors.cloud.aliyuncs.com/debian-security codename/updates main
+deb http://mirrors.cloud.aliyuncs.com/debian/ codename-updates main non-free contrib
+deb-src http://mirrors.cloud.aliyuncs.com/debian/ codename-updates main non-free contrib
+deb http://mirrors.cloud.aliyuncs.com/debian/ codename-backports main non-free contrib
+deb-src http://mirrors.cloud.aliyuncs.com/debian/ codename-backports main non-free contrib
 EOL
 
 cat > ".deb-list" <<EOL

buildpacks/go/buildpack.toml buildpacks/go/buildpack.tmplbuildpacks/go/buildpack.toml renamed to buildpacks/go/buildpack.tmpl

@@ -10,4 +10,4 @@ homepage = "https://github.com/drycc/pack-images/tree/main/buildpacks/go"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "drycc-bookworm"
+id = "{STACK_ID}"

buildpacks/java/buildpack.toml buildpacks/java/buildpack.tmplbuildpacks/java/buildpack.toml renamed to buildpacks/java/buildpack.tmpl

@@ -10,4 +10,4 @@ homepage = "https://github.com/drycc/pack-images/tree/main/buildpacks/java"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "drycc-bookworm"
+id = "{STACK_ID}"