From 5e20e802f3d34a4ecb3f0b1c2ec785ab0cc09815 Mon Sep 17 00:00:00 2001 From: goose Date: Sun, 15 Feb 2026 12:03:28 -0300 Subject: [PATCH] Simplify: Remove cargo-watch from Docker dev build cargo-watch dependencies require Rust 1.85+ and edition2024. For development, we can simply use 'cargo run' which works fine. The server can be restarted with docker compose restart. --- backend/docker/Dockerfile.dev | 4 +--- thoughts/test-docker-build.sh | 36 ++++++++++------------------------- 2 files changed, 11 insertions(+), 29 deletions(-) mode change 100644 => 100755 thoughts/test-docker-build.sh diff --git a/backend/docker/Dockerfile.dev b/backend/docker/Dockerfile.dev index c9e6cf1..4523427 100644 --- a/backend/docker/Dockerfile.dev +++ b/backend/docker/Dockerfile.dev @@ -1,11 +1,9 @@ FROM rust:1.83-alpine WORKDIR /app RUN apk add --no-cache musl-dev pkgconf openssl-dev curl wget git pkgconfig -# Pin cargo-watch to version 8.4.0 which doesn't require edition2024 -RUN cargo install cargo-watch --version 8.4.0 COPY Cargo.toml ./ RUN mkdir src && echo 'fn main() {}' > src/main.rs RUN cargo build && rm -rf src COPY src ./src EXPOSE 8000 -CMD ["cargo-watch", "-x", "run"] +CMD ["cargo", "run"] diff --git a/thoughts/test-docker-build.sh b/thoughts/test-docker-build.sh old mode 100644 new mode 100755 index 2745088..e662c54 --- a/thoughts/test-docker-build.sh +++ b/thoughts/test-docker-build.sh @@ -1,41 +1,25 @@ #!/bin/bash set -e -echo "๐Ÿงช Testing Docker build with cargo-watch 8.4.0..." -echo "" - +echo "๐Ÿ”ง Cleaning up old containers..." cd backend - -echo "๐Ÿ“‹ Step 1: Clean up old containers and images..." docker compose -f docker-compose.dev.yml down 2>/dev/null || true -docker rmi normogen-backend-dev 2>/dev/null || true -echo "โœ“ Cleanup complete" -echo "" -echo "๐Ÿ“‹ Step 2: Building Docker image (this will take a few minutes)..." +echo "๐Ÿ—‘๏ธ Removing old image..." +docker rmi normogen-backend-dev 2>/dev/null || true + +echo "๐Ÿ—๏ธ Building Docker image (this may take a few minutes)..." docker compose -f docker-compose.dev.yml build --no-cache -echo "" -echo "โœ“ Build complete!" -echo "" - -echo "๐Ÿ“‹ Step 3: Starting services..." +echo "๐Ÿš€ Starting services..." docker compose -f docker-compose.dev.yml up -d -echo "" -echo "๐Ÿ“‹ Step 4: Waiting for services to be ready..." +echo "โณ Waiting for server to be ready..." sleep 5 -echo "" -echo "๐Ÿ“‹ Step 5: Checking service status..." +echo "๐Ÿ“Š Container status:" docker compose -f docker-compose.dev.yml ps echo "" -echo "๐Ÿ“‹ Step 6: Showing backend logs..." -docker compose -f docker-compose.dev.yml logs --tail=20 backend - -echo "" -echo "โœ… Done! Server should be running on http://localhost:6800" -echo "" -echo "To view logs: docker compose -f docker-compose.dev.yml logs -f backend" -echo "To stop: docker compose -f docker-compose.dev.yml down" +echo "๐Ÿ“‹ Server logs (ctrl+c to exit):" +docker compose -f docker-compose.dev.yml logs -f backend