chore(imagebuilder): add codename build-arg

Author: duanhongyi

.woodpecker/build-linux.yml

@@ -16,6 +16,7 @@ pipeline:
   - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
   - make docker-build docker-immutable-push
   secrets:
+  - codename
   - dev_registry
   - drycc_registry
   - container_username

.woodpecker/test-linux.yml

@@ -14,6 +14,7 @@ pipeline:
   commands:
   - make test
   secrets:
+  - codename
   - dev_registry
   when:
     event:

Makefile

@@ -28,11 +28,11 @@ build:
 	@echo Nothing to do.
 
 docker-build:
-	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} -f rootfs/Dockerfile rootfs
+	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} -f rootfs/Dockerfile rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 docker-buildx:
-	docker buildx build --platform ${PLATFORM} ${DOCKER_BUILD_FLAGS} -t ${IMAGE} -f rootfs/Dockerfile rootfs --push
+	docker buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} ${DOCKER_BUILD_FLAGS} -t ${IMAGE} -f rootfs/Dockerfile rootfs --push
 
 deploy: docker-build docker-push
 

charts/imagebuilder/templates/imagebuilder-configmap.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     heritage: drycc
 data:
-  buildpacks: "{{.Values.imageRegistry}}/{{.Values.imageOrg}}/buildpacks:bookworm"
+  buildpacks: "{{.Values.imageRegistry}}/{{.Values.imageOrg}}/buildpacks:{{.Values.codename}}"
   auths.json: |
     {
         "auths": {

charts/imagebuilder/values.yaml

@@ -2,6 +2,7 @@ imageOrg: "drycc"
 imagePullPolicy: "Always"
 imageTag: "canary"
 imageRegistry: "registry.drycc.cc"
+codename: bookworm
 containerRegistries: |
   unqualified-search-registries = ["registry.drycc.cc"]
   short-name-mode="permissive"

rootfs/Dockerfile

@@ -1,10 +1,11 @@
-FROM registry.drycc.cc/drycc/base:bookworm
+ARG CODENAME
+FROM registry.drycc.cc/drycc/base:${CODENAME}
 
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/home/drycc \
   PODMAN_VERSION="4.5.1" \
-  MC_VERSION="2023.06.15.15.08.26" \
+  MC_VERSION="2023.06.23.18.12.07" \
   CADDY_VERSION="2.6.4" \
   PACK_VERSION="0.29.0" \
   GOSU_VERSION="1.16"