Skip to content

Commit 97492ef

Browse files
authored
Merge pull request #726 from kzys/debian-upgrade
Use Debian 11 (bullseye) everywhere
2 parents e5ec506 + 604dcd2 commit 97492ef

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

.buildkite/al2_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ steps:
2424
FICD_DM_VOLUME_GROUP: "fcci-vg"
2525
command:
2626
- ./.buildkite/setup_al2.sh
27-
- docker run --rm -v $PWD:/mnt debian:buster-slim rm -rf /mnt/tools/image-builder/rootfs
27+
- docker run --rm -v $PWD:/mnt debian:bullseye-slim rm -rf /mnt/tools/image-builder/rootfs
2828

2929
- wait
3030

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ steps:
2323
EXTRAGOARGS: "-race"
2424
command:
2525
- make test-images
26-
- docker run --rm -v $PWD:/mnt debian:buster-slim rm -rf /mnt/tools/image-builder/rootfs
26+
- docker run --rm -v $PWD:/mnt debian:bullseye-slim rm -rf /mnt/tools/image-builder/rootfs
2727
- sudo install -d -o root -g buildkite-agent -m 775 "/local/artifacts/$BUILDKITE_BUILD_NUMBER"
2828
- cp tools/image-builder/rootfs.img "/local/artifacts/$BUILDKITE_BUILD_NUMBER/"
2929

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SUBMODULES=_submodules
2828
UID:=$(shell id -u)
2929
GID:=$(shell id -g)
3030

31-
FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.17-buster
31+
FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.17-bullseye
3232
export FIRECRACKER_CONTAINERD_TEST_IMAGE?=localhost/firecracker-containerd-test
3333
export GO_CACHE_VOLUME_NAME?=gocache
3434

tools/docker/Dockerfile.integ-test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:experimental
22
# Test image that starts up containerd and the devmapper snapshotter. The default CMD will drop to a bash shell. Overrides
33
# to CMD will be provided appended to /bin/bash -c
4-
FROM golang:1.17-stretch
4+
FROM golang:1.17-bullseye
55
ENV PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/go/bin"
66
ENV INSTALLROOT="/usr/local"
77
ENV DEBIAN_FRONTEND="noninteractive"
@@ -20,6 +20,7 @@ RUN apt-get update && apt-get install --yes --no-install-recommends \
2020
libdevmapper-dev \
2121
libseccomp-dev \
2222
tcpdump \
23+
iproute2 \
2324
rng-tools # used for rngtest
2425

2526
RUN mkdir -p \

tools/image-builder/Dockerfile.debian-image

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# express or implied. See the License for the specific language governing
1212
# permissions and limitations under the License.
1313

14-
FROM debian:buster-slim
14+
FROM debian:bullseye-slim
1515

1616
RUN apt-get update && \
1717
DEBIAN_FRONTEND=noninteractive apt-get -y install \

0 commit comments

Comments
 (0)