downgrade to bookworm since it still comes with mkfs.ext4

Signed-off-by: Justin Alvarez <[email protected]>

Author: pendo324

Makefile

@@ -29,7 +29,7 @@ SUBMODULES=_submodules
 UID:=$(shell id -u)
 GID:=$(shell id -g)
 
-FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.24-trixie
+FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.24-bookworm
 export FIRECRACKER_CONTAINERD_TEST_IMAGE?=localhost/firecracker-containerd-test
 export GO_CACHE_VOLUME_NAME?=gocache
 

tools/docker/Dockerfile.integ-test

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:experimental
 # Test image that starts up containerd and the devmapper snapshotter. The default CMD will drop to a bash shell. Overrides
 # to CMD will be provided appended to /bin/bash -c
-FROM public.ecr.aws/docker/library/golang:1.24-trixie
+FROM public.ecr.aws/docker/library/golang:1.24-bookworm
 ENV PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/go/bin"
 ENV INSTALLROOT="/usr/local"
 ENV DEBIAN_FRONTEND="noninteractive"

tools/docker/Dockerfile.proto-builder

@@ -11,7 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-FROM public.ecr.aws/docker/library/golang:1.24-trixie
+FROM public.ecr.aws/docker/library/golang:1.24-bookworm
 
 RUN apt-get update && apt-get install --yes --no-install-recommends \
 	libprotobuf-dev=3.21.12-11 \

tools/docker/Dockerfile.runc-builder

@@ -11,7 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-FROM public.ecr.aws/docker/library/golang:1.24-trixie
+FROM public.ecr.aws/docker/library/golang:1.24-bookworm
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install libseccomp-dev pkg-config e2fsprogs

tools/docker/Dockerfile.stargz-builder

@@ -11,4 +11,4 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-FROM public.ecr.aws/docker/library/golang:1.24-trixie
+FROM public.ecr.aws/docker/library/golang:1.24-bookworm

tools/docker/entrypoint.sh

@@ -66,7 +66,7 @@ EOF
 
 touch ${FICD_CONTAINERD_OUTFILE}
 chmod a+rw ${FICD_CONTAINERD_OUTFILE}
-PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/go/bin" /usr/local/bin/containerd --log-level debug &>> ${FICD_CONTAINERD_OUTFILE} &
+/usr/local/bin/containerd --log-level debug &>> ${FICD_CONTAINERD_OUTFILE} &
 
 /usr/local/bin/http-address-resolver &>> ${FICD_LOG_DIR}/http-address-resolver.out &
 /usr/local/bin/demux-snapshotter &>> ${FICD_LOG_DIR}/demux-snapshotter.out &