From 08a246a90cb60ffc54a615252acb4a095fcf22b5 Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Mon, 29 Sep 2025 00:46:51 -0700 Subject: [PATCH] bullseye -> trixie --- .devcontainer/dev.compose.yaml | 2 +- .devcontainer/devcontainer.json | 2 +- bin/binaries.Dockerfile | 2 +- bin/chef.binaries.Dockerfile | 2 +- bin/cli/aio.Dockerfile | 2 +- bin/cli/multi-arch.Dockerfile | 2 +- bin/core/aio.Dockerfile | 4 ++-- bin/core/multi-arch.Dockerfile | 2 +- bin/core/single-arch.Dockerfile | 2 +- bin/periphery/aio.Dockerfile | 4 ++-- bin/periphery/multi-arch.Dockerfile | 2 +- bin/periphery/single-arch.Dockerfile | 2 +- example/alerter/Dockerfile | 2 +- example/update_logger/Dockerfile | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.devcontainer/dev.compose.yaml b/.devcontainer/dev.compose.yaml index a3d91f3ef..f38a0fae2 100644 --- a/.devcontainer/dev.compose.yaml +++ b/.devcontainer/dev.compose.yaml @@ -1,6 +1,6 @@ services: dev: - image: mcr.microsoft.com/devcontainers/rust:1-1-bullseye + image: mcr.microsoft.com/devcontainers/rust:1-1-trixie volumes: # Mount the root folder that contains .git - ../:/workspace:cached diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 93d2f6718..42f89d3bd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "Komodo", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - //"image": "mcr.microsoft.com/devcontainers/rust:1-1-bullseye", + //"image": "mcr.microsoft.com/devcontainers/rust:1-1-trixie", "dockerComposeFile": ["dev.compose.yaml"], "workspaceFolder": "/workspace", "service": "dev", diff --git a/bin/binaries.Dockerfile b/bin/binaries.Dockerfile index dc74a04b6..f5a80745c 100644 --- a/bin/binaries.Dockerfile +++ b/bin/binaries.Dockerfile @@ -1,7 +1,7 @@ ## Builds the Komodo Core, Periphery, and Util binaries ## for a specific architecture. -FROM rust:1.89.0-bullseye AS builder +FROM rust:1.90.0-trixie AS builder RUN cargo install cargo-strip WORKDIR /builder diff --git a/bin/chef.binaries.Dockerfile b/bin/chef.binaries.Dockerfile index d2d2423fb..f87e16354 100644 --- a/bin/chef.binaries.Dockerfile +++ b/bin/chef.binaries.Dockerfile @@ -3,7 +3,7 @@ ## Uses chef for dependency caching to help speed up back-to-back builds. -FROM lukemathwalker/cargo-chef:latest-rust-1.89.0-bullseye AS chef +FROM lukemathwalker/cargo-chef:latest-rust-1.90.0-trixie AS chef WORKDIR /builder # Plan just the RECIPE to see if things have changed diff --git a/bin/cli/aio.Dockerfile b/bin/cli/aio.Dockerfile index f86c2d807..8d00c5284 100644 --- a/bin/cli/aio.Dockerfile +++ b/bin/cli/aio.Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.89.0-bullseye AS builder +FROM rust:1.90.0-trixie AS builder RUN cargo install cargo-strip WORKDIR /builder diff --git a/bin/cli/multi-arch.Dockerfile b/bin/cli/multi-arch.Dockerfile index 682ff734b..775cd7179 100644 --- a/bin/cli/multi-arch.Dockerfile +++ b/bin/cli/multi-arch.Dockerfile @@ -9,7 +9,7 @@ ARG AARCH64_BINARIES=${BINARIES_IMAGE}-aarch64 FROM ${X86_64_BINARIES} AS x86_64 FROM ${AARCH64_BINARIES} AS aarch64 -FROM debian:bullseye-slim +FROM debian:trixie-slim WORKDIR /app diff --git a/bin/core/aio.Dockerfile b/bin/core/aio.Dockerfile index c22b1a2f2..174bbb2ed 100644 --- a/bin/core/aio.Dockerfile +++ b/bin/core/aio.Dockerfile @@ -1,7 +1,7 @@ ## All in one, multi stage compile + runtime Docker build for your architecture. # Build Core -FROM rust:1.89.0-bullseye AS core-builder +FROM rust:1.90.0-trixie AS core-builder RUN cargo install cargo-strip WORKDIR /builder @@ -26,7 +26,7 @@ RUN cd client && yarn && yarn build && yarn link RUN cd frontend && yarn link komodo_client && yarn && yarn build # Final Image -FROM debian:bullseye-slim +FROM debian:trixie-slim COPY ./bin/core/starship.toml /starship.toml COPY ./bin/core/debian-deps.sh . diff --git a/bin/core/multi-arch.Dockerfile b/bin/core/multi-arch.Dockerfile index 40be8e88e..e27ff5cf7 100644 --- a/bin/core/multi-arch.Dockerfile +++ b/bin/core/multi-arch.Dockerfile @@ -13,7 +13,7 @@ FROM ${AARCH64_BINARIES} AS aarch64 FROM ${FRONTEND_IMAGE} AS frontend # Final Image -FROM debian:bullseye-slim +FROM debian:trixie-slim COPY ./bin/core/starship.toml /starship.toml COPY ./bin/core/debian-deps.sh . diff --git a/bin/core/single-arch.Dockerfile b/bin/core/single-arch.Dockerfile index 712e0adfb..54a21d656 100644 --- a/bin/core/single-arch.Dockerfile +++ b/bin/core/single-arch.Dockerfile @@ -14,7 +14,7 @@ COPY ./client/core/ts ./client RUN cd client && yarn && yarn build && yarn link RUN cd frontend && yarn link komodo_client && yarn && yarn build -FROM debian:bullseye-slim +FROM debian:trixie-slim COPY ./bin/core/starship.toml /starship.toml COPY ./bin/core/debian-deps.sh . diff --git a/bin/periphery/aio.Dockerfile b/bin/periphery/aio.Dockerfile index 475a19b84..e573399e5 100644 --- a/bin/periphery/aio.Dockerfile +++ b/bin/periphery/aio.Dockerfile @@ -1,6 +1,6 @@ ## All in one, multi stage compile + runtime Docker build for your architecture. -FROM rust:1.89.0-bullseye AS builder +FROM rust:1.90.0-trixie AS builder RUN cargo install cargo-strip WORKDIR /builder @@ -14,7 +14,7 @@ COPY ./bin/periphery ./bin/periphery RUN cargo build -p komodo_periphery --release && cargo strip # Final Image -FROM debian:bullseye-slim +FROM debian:trixie-slim COPY ./bin/periphery/starship.toml /starship.toml COPY ./bin/periphery/debian-deps.sh . diff --git a/bin/periphery/multi-arch.Dockerfile b/bin/periphery/multi-arch.Dockerfile index 3751fafe9..4d00a2646 100644 --- a/bin/periphery/multi-arch.Dockerfile +++ b/bin/periphery/multi-arch.Dockerfile @@ -10,7 +10,7 @@ ARG AARCH64_BINARIES=${BINARIES_IMAGE}-aarch64 FROM ${X86_64_BINARIES} AS x86_64 FROM ${AARCH64_BINARIES} AS aarch64 -FROM debian:bullseye-slim +FROM debian:trixie-slim COPY ./bin/periphery/starship.toml /starship.toml COPY ./bin/periphery/debian-deps.sh . diff --git a/bin/periphery/single-arch.Dockerfile b/bin/periphery/single-arch.Dockerfile index 586939ca0..96f5c2cf2 100644 --- a/bin/periphery/single-arch.Dockerfile +++ b/bin/periphery/single-arch.Dockerfile @@ -6,7 +6,7 @@ ARG BINARIES_IMAGE=ghcr.io/moghtech/komodo-binaries:latest # This is required to work with COPY --from FROM ${BINARIES_IMAGE} AS binaries -FROM debian:bullseye-slim +FROM debian:trixie-slim COPY ./bin/periphery/starship.toml /starship.toml COPY ./bin/periphery/debian-deps.sh . diff --git a/example/alerter/Dockerfile b/example/alerter/Dockerfile index a264ee71e..58ddb7515 100644 --- a/example/alerter/Dockerfile +++ b/example/alerter/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.89.0 as builder +FROM rust:1.90.0-trixie as builder WORKDIR /builder COPY . . diff --git a/example/update_logger/Dockerfile b/example/update_logger/Dockerfile index ed5c4426c..84b24714a 100644 --- a/example/update_logger/Dockerfile +++ b/example/update_logger/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.89.0 as builder +FROM rust:1.90.0-trixie as builder WORKDIR /builder COPY . .