chore(pack-images): upgrade to bookworm

duanhongyi · duanhongyi · commit bc5135de2837 · 2023-06-16T13:55:55.000+08:00
diff --git a/.woodpecker/build-linux-buildpacks.yml b/.woodpecker/build-linux-buildpacks.yml
@@ -25,7 +25,7 @@ pipeline:
   - export PACK_HOME=$CI_WORKSPACE
   - make publish-buildpack
   environment:
-    CODENAME: bullseye
+    CODENAME: bookworm
   secrets:
   - dev_registry
   - drycc_registry
diff --git a/.woodpecker/build-linux-pack.yml b/.woodpecker/build-linux-pack.yml
@@ -13,7 +13,7 @@ pipeline:
   image: bash
   commands:
   - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
-  - CODENAME=bullseye make publish-pack
+  - CODENAME=bookworm make publish-pack
   secrets:
   - dev_registry
   - drycc_registry
diff --git a/.woodpecker/manifest-buildpacks.yml b/.woodpecker/manifest-buildpacks.yml
@@ -8,9 +8,9 @@ pipeline:
   image: bash
   commands:
   - sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest-buildpacks.tmpl
-  - sed -i "s/{{codename}}/bullseye/g" .woodpecker/manifest-buildpacks.tmpl
+  - sed -i "s/{{codename}}/bookworm/g" .woodpecker/manifest-buildpacks.tmpl
   environment:
-    CODENAME: bullseye
+    CODENAME: bookworm
   secrets:
   - dev_registry
   - drycc_registry
diff --git a/.woodpecker/manifest-pack.yml b/.woodpecker/manifest-pack.yml
@@ -9,8 +9,10 @@ pipeline:
   commands:
   - sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest-run.tmpl
   - sed -i "s/registry.drycc.cc/$${DRYCC_REGISTRY}/g" .woodpecker/manifest-build.tmpl
-  - sed -i "s/{{codename}}/bullseye/g" .woodpecker/manifest-run.tmpl
-  - sed -i "s/{{codename}}/bullseye/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:
   - dev_registry
   - drycc_registry
diff --git a/.woodpecker/test-linux.yml b/.woodpecker/test-linux.yml
@@ -14,7 +14,7 @@ pipeline:
   commands:
   - CODENAME=$${CODENAME} make test-style
   environment:
-    CODENAME: bullseye
+    CODENAME: bookworm
   secrets:
   - dev_registry
   - codecov_token
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 # If DRYCC_REGISTRY is not set, try to populate it from legacy DEV_REGISTRY
-CODENAME ?= bullseye
+CODENAME ?= bookworm
 DEV_REGISTRY ?= registry.drycc.cc
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
 PLATFORM ?= $(shell python3 _scripts/utils.py platform)
diff --git a/README.md b/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:bullseye](https://hub.docker.com/r/drycc/pack/tags/) - A CNB
-  compatible run image based on drycc/pack:bullseye
-* [drycc/pack:bullseye-build](https://hub.docker.com/r/drycc/pack/tags/) - A CNB
-  compatible build image based on drycc/pack:bullseye-build
+* [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
 
 ## Usage
 
-`pack build myapp --builder drycc/buildpacks:bullseye`
+`pack build myapp --builder drycc/buildpacks:bookworm`
 
 ## System
 
 The basic image is based on Debian system, See the table below for system description：
 
 STACK ID        | Buildpacks image                            | Operating System
 ----------------|---------------------------------------------|---------------------------------
-drycc-bullseye  | registry.drycc.cc/drycc/buildpacks:bullseye | Debian 11 Bullseye 
+drycc-bookworm  | registry.drycc.cc/drycc/buildpacks:bookworm | Debian 11 bookworm 
 
 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/ bullseye main non-free contrib
-deb-src http://mirrors.cloud.aliyuncs.com/debian/ bullseye main non-free contrib
-deb http://mirrors.cloud.aliyuncs.com/debian-security bullseye/updates main
-deb-src http://mirrors.cloud.aliyuncs.com/debian-security bullseye/updates main
-deb http://mirrors.cloud.aliyuncs.com/debian/ bullseye-updates main non-free contrib
-deb-src http://mirrors.cloud.aliyuncs.com/debian/ bullseye-updates main non-free contrib
-deb http://mirrors.cloud.aliyuncs.com/debian/ bullseye-backports main non-free contrib
-deb-src http://mirrors.cloud.aliyuncs.com/debian/ bullseye-backports main non-free contrib
+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
 EOL
 
 cat > ".deb-list" <<EOL
diff --git a/buildpacks/go/buildpack.toml b/buildpacks/go/buildpack.toml
@@ -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-bullseye"
+id = "drycc-bookworm"
diff --git a/buildpacks/java/buildpack.toml b/buildpacks/java/buildpack.toml
@@ -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-bullseye"
+id = "drycc-bookworm"
diff --git a/buildpacks/node/buildpack.toml b/buildpacks/node/buildpack.toml
@@ -10,4 +10,4 @@ homepage = "https://github.com/drycc/pack-images/tree/main/buildpacks/node"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "drycc-bullseye"
+id = "drycc-bookworm"
diff --git a/buildpacks/php/buildpack.toml b/buildpacks/php/buildpack.toml
@@ -10,4 +10,4 @@ homepage = "https://github.com/drycc/pack-images/tree/main/buildpacks/php"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "drycc-bullseye"
+id = "drycc-bookworm"
diff --git a/buildpacks/python/buildpack.toml b/buildpacks/python/buildpack.toml
@@ -10,4 +10,4 @@ homepage = "https://github.com/drycc/pack-images/tree/main/buildpacks/python"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "drycc-bullseye"
+id = "drycc-bookworm"
diff --git a/buildpacks/ruby/buildpack.toml b/buildpacks/ruby/buildpack.toml
@@ -10,4 +10,4 @@ homepage = "https://github.com/drycc/pack-images/tree/main/buildpacks/ruby"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "drycc-bullseye"
+id = "drycc-bookworm"
diff --git a/buildpacks/rust/buildpack.toml b/buildpacks/rust/buildpack.toml
@@ -10,4 +10,4 @@ homepage = "https://github.com/drycc/pack-images/tree/main/buildpacks/rust"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "drycc-bullseye"
+id = "drycc-bookworm"
diff --git a/rootfs/usr/local/bin/apt-utils.sh b/rootfs/usr/local/bin/apt-utils.sh
@@ -31,7 +31,8 @@ dpkg-install() {
     if [[ ! -f "${DEB_FILE}" ]] ; then
         curl -fsSL -o "${DEB_FILE}" "${DEB_URL}"
     fi
-    readonly control_dir=$(mktemp -d)
+    control_dir=$(mktemp -d)
+    readonly control_dir
     dpkg -e "${DEB_FILE}" "${control_dir}"
     if [[ -f "${control_dir}"/preinst ]] ; then
         sed -i "s#/usr/lib/#$APT_INSTALL_DIR/usr/lib/#g" "${control_dir}"/preinst
