Skip to content

Commit b81c95c

Browse files
committed
chore(imagebuilder): upgrade to bookworm
1 parent b01b6ac commit b81c95c

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

charts/imagebuilder/templates/imagebuilder-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
labels:
66
heritage: drycc
77
data:
8-
buildpacks: "{{.Values.imageRegistry}}/{{.Values.imageOrg}}/buildpacks:bullseye"
8+
buildpacks: "{{.Values.imageRegistry}}/{{.Values.imageOrg}}/buildpacks:bookworm"
99
auths.json: |
1010
{
1111
"auths": {

rootfs/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM registry.drycc.cc/drycc/base:bullseye
1+
FROM registry.drycc.cc/drycc/base:bookworm
22

33
ENV DRYCC_UID=1001 \
44
DRYCC_GID=1001 \
55
DRYCC_HOME_DIR=/home/drycc \
66
PODMAN_VERSION="4.5.1" \
7-
MC_VERSION="2022.08.28.20.08.11" \
7+
MC_VERSION="2023.06.15.15.08.26" \
88
CADDY_VERSION="2.6.4" \
99
PACK_VERSION="0.29.0" \
1010
GOSU_VERSION="1.16"

rootfs/imagebuilder/build

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ if [ -f "${from_registries_file}" ]; then
4343
install -D "${from_registries_file}" "${CONTAINERS_CONFIG_DIR}"/registries.conf
4444
fi
4545

46-
readonly REGISTRY_AUTH_FILE="${HOME}"/.docker/config.json
46+
REGISTRY_AUTH_FILE="${HOME}"/.docker/config.json
47+
readonly REGISTRY_AUTH_FILE
4748
from_auths_file="/etc/imagebuilder/auths.json"
4849
if [ -f "${from_auths_file}" ]; then
4950
install -D "${from_auths_file}" "${REGISTRY_AUTH_FILE}"
@@ -110,7 +111,8 @@ else
110111
echo "---> Building pack"
111112
echo "---> Using builder ${pack_builder}"
112113
# podman connection
113-
readonly DOCKER_HOST="unix://$(podman info -f "{{.Host.RemoteSocket.Path}}")"
114+
DOCKER_HOST="unix://$(podman info -f "{{.Host.RemoteSocket.Path}}")"
115+
readonly DOCKER_HOST
114116
export DOCKER_HOST
115117

116118
pack_build="pack build ${IMAGE_NAME} \

0 commit comments

Comments
 (0)