Skip to content

Commit d472487

Browse files
committed
more trixie => bookworm and fix protobuf version
Signed-off-by: Justin Alvarez <[email protected]>
1 parent ddce5a8 commit d472487

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-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:trixie-slim rm -rf /mnt/tools/image-builder/rootfs
27+
- docker run --rm -v $PWD:/mnt debian:bookworm-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
@@ -22,7 +22,7 @@ steps:
2222
EXTRAGOARGS: "-race"
2323
command:
2424
- make test-images
25-
- docker run --rm -v $PWD:/mnt debian:trixie-slim rm -rf /mnt/tools/image-builder/rootfs
25+
- docker run --rm -v $PWD:/mnt debian:bookworm-slim rm -rf /mnt/tools/image-builder/rootfs
2626
- sudo install -d -o root -g buildkite-agent -m 775 "/local/artifacts/$BUILDKITE_BUILD_NUMBER"
2727
- cp tools/image-builder/rootfs.img "/local/artifacts/$BUILDKITE_BUILD_NUMBER/"
2828

tools/docker/Dockerfile.proto-builder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
FROM public.ecr.aws/docker/library/golang:1.24-bookworm
1515

1616
RUN apt-get update && apt-get install --yes --no-install-recommends \
17-
libprotobuf-dev=3.21.12-11 \
18-
protobuf-compiler=3.21.12-11 \
17+
libprotobuf-dev=3.21.12-3 \
18+
protobuf-compiler=3.21.12-3 \
1919
&& go install google.golang.org/protobuf/cmd/[email protected] \
2020
&& go install github.com/containerd/ttrpc/cmd/[email protected] \
2121
&& mkdir /protobuf

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 public.ecr.aws/docker/library/debian:trixie-slim
14+
FROM public.ecr.aws/docker/library/debian:bookworm-slim
1515

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

0 commit comments

Comments
 (0)