From 2bf2be54cc1bd2e0a0c0174ca6f21e7312c33a3f Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Wed, 29 May 2024 13:09:52 -0700 Subject: [PATCH] bookworm base --- bin/core/Dockerfile | 5 ++--- bin/migrator/src/migrate.rs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/core/Dockerfile b/bin/core/Dockerfile index e35aaf074..ee69676ed 100644 --- a/bin/core/Dockerfile +++ b/bin/core/Dockerfile @@ -1,5 +1,5 @@ # Build Core -FROM rust:1.78.0-bullseye as core-builder +FROM rust:1.78.0-bookworm as core-builder WORKDIR /builder COPY . . RUN cargo build -p monitor_core --release @@ -13,8 +13,7 @@ RUN cd client && yarn && yarn build && yarn link RUN cd frontend && yarn link @monitor/client && yarn && yarn build # Final Image -# FROM gcr.io/distroless/cc -FROM debian:bullseye-slim +FROM debian:bookworm-slim RUN apt update && apt install -y ca-certificates COPY ./config_example/core.config.example.toml /config/config.toml COPY --from=core-builder /builder/target/release/core / diff --git a/bin/migrator/src/migrate.rs b/bin/migrator/src/migrate.rs index 3d06fbc2e..5e8ac9d0a 100644 --- a/bin/migrator/src/migrate.rs +++ b/bin/migrator/src/migrate.rs @@ -11,7 +11,7 @@ pub async fn migrate_all( legacy_db: &v0::DbClient, target_db: &crate::DbClient, ) -> anyhow::Result<()> { - // migrate_users(legacy_db, target_db).await?; + migrate_users(legacy_db, target_db).await?; migrate_servers(legacy_db, target_db).await?; migrate_deployments(legacy_db, target_db).await?; migrate_builds(legacy_db, target_db).await?;