Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/dev.compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
dev:
image: mcr.microsoft.com/devcontainers/rust:1-1-bullseye
image: mcr.microsoft.com/devcontainers/rust:1-1-bookworm
volumes:
# Mount the root folder that contains .git
- ../:/workspace:cached
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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-bookworm",
"dockerComposeFile": ["dev.compose.yaml"],
"workspaceFolder": "/workspace",
"service": "dev",
Expand Down
2 changes: 1 addition & 1 deletion bin/binaries.Dockerfile
Original file line number Diff line number Diff line change
@@ -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.89.0-bookworm AS builder
RUN cargo install cargo-strip

WORKDIR /builder
Expand Down
2 changes: 1 addition & 1 deletion bin/chef.binaries.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.89.0-bookworm AS chef
WORKDIR /builder

# Plan just the RECIPE to see if things have changed
Expand Down
2 changes: 1 addition & 1 deletion bin/cli/aio.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.89.0-bullseye AS builder
FROM rust:1.89.0-bookworm AS builder
RUN cargo install cargo-strip

WORKDIR /builder
Expand Down
2 changes: 1 addition & 1 deletion bin/cli/multi-arch.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:bookworm-slim

WORKDIR /app

Expand Down
4 changes: 2 additions & 2 deletions bin/core/aio.Dockerfile
Original file line number Diff line number Diff line change
@@ -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.89.0-bookworm AS core-builder
RUN cargo install cargo-strip

WORKDIR /builder
Expand All @@ -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:bookworm-slim

COPY ./bin/core/starship.toml /starship.toml
COPY ./bin/core/debian-deps.sh .
Expand Down
2 changes: 1 addition & 1 deletion bin/core/multi-arch.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM ${AARCH64_BINARIES} AS aarch64
FROM ${FRONTEND_IMAGE} AS frontend

# Final Image
FROM debian:bullseye-slim
FROM debian:bookworm-slim

COPY ./bin/core/starship.toml /starship.toml
COPY ./bin/core/debian-deps.sh .
Expand Down
2 changes: 1 addition & 1 deletion bin/core/single-arch.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:bookworm-slim

COPY ./bin/core/starship.toml /starship.toml
COPY ./bin/core/debian-deps.sh .
Expand Down
4 changes: 2 additions & 2 deletions bin/periphery/aio.Dockerfile
Original file line number Diff line number Diff line change
@@ -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.89.0-bookworm AS builder
RUN cargo install cargo-strip

WORKDIR /builder
Expand All @@ -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:bookworm-slim

COPY ./bin/periphery/starship.toml /starship.toml
COPY ./bin/periphery/debian-deps.sh .
Expand Down
2 changes: 1 addition & 1 deletion bin/periphery/multi-arch.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:bookworm-slim

COPY ./bin/periphery/starship.toml /starship.toml
COPY ./bin/periphery/debian-deps.sh .
Expand Down
2 changes: 1 addition & 1 deletion bin/periphery/single-arch.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:bookworm-slim

COPY ./bin/periphery/starship.toml /starship.toml
COPY ./bin/periphery/debian-deps.sh .
Expand Down