created a useful dev container

Author: pemattern

.env

@@ -0,0 +1,10 @@
+dev:
+	docker compose --file docker/docker-compose.dev.yml up --build --remove-orphans
+
+prod:
+	docker compose --file docker/docker-compose.yml up --build --remove-orphans --detach
+
+down:
+	docker compose down
+
+	

Makefile

@@ -1,4 +1,4 @@
-FROM rust:1.90.0 AS base
+FROM rust:1.91.0 AS base
 
 FROM base AS server-builder
 WORKDIR /server

.env.sample renamed to docker/.env.sample

@@ -0,0 +1,11 @@
+FROM rust:1.91.0
+WORKDIR /server
+COPY server/Cargo.lock server/Cargo.toml ./
+COPY lib /lib
+RUN mkdir src && echo "fn main() {}" > src/main.rs && cargo build --release && rm -rf src
+COPY server/src ./src
+COPY server/migrations ./migrations
+RUN touch src/main.rs
+EXPOSE 3000
+CMD ["bash", "-c", "cargo run"]
+

Dockerfile renamed to docker/Dockerfile

@@ -0,0 +1,51 @@
+name: open-erase
+services:
+  backend:
+    container_name: backend
+    image: backend
+    env_file: .env
+    build:
+      context: ../.
+      dockerfile: docker/dev.Dockerfile
+    ports:
+      - "3000:3000"
+    restart: always
+    depends_on:
+      - open-erase-db
+
+      
+  web:
+    container_name: web
+    image: web
+    build:
+      context: ../.
+      dockerfile: docker/web-dev.Dockerfile
+    ports:
+      - "8080:8080"
+    volumes:
+      - ../web:/web
+    restart: always
+    depends_on:
+      - backend
+
+  open-erase-db:
+    container_name: open-erase-db
+    image: postgres:18
+    restart: always
+    env_file: .env
+    environment:
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    ports:
+      - "5432:5432"
+    volumes:
+      - db:/var/lib/postgresql
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  db:
+    driver: local

docker/dev.Dockerfile

@@ -0,0 +1,9 @@
+FROM rust:1.91.0
+RUN rustup target add wasm32-unknown-unknown
+RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+RUN cargo binstall trunk wasm-bindgen-cli
+WORKDIR /web
+COPY lib /lib
+COPY web ./
+EXPOSE 8080
+CMD ["bash", "-c", "trunk serve"]

docker/docker-compose.dev.yml

@@ -37,13 +37,12 @@ const LOGOUT_PATH: &str = "/logout";
 const REFRESH_PATH: &str = "/refresh";
 const USERS_PATH: &str = "/users";
 
-const STATIC_ASSETS_PATH: &str = "/dist";
-const INDEX_HTML_PATH: &str = "/dist/index.html";
+const STATIC_ASSETS_PATH: &str = "/web/dist";
+const INDEX_HTML_PATH: &str = "/web/dist/index.html";
 
 pub fn app(state: AppState) -> Router {
-    Router::new()
+    let router = Router::new()
         .merge(api_router(state.clone()))
-        .fallback_service(web_service())
         .method_not_allowed_fallback(method_not_allowed_fallback)
         .layer(
             ServiceBuilder::new()
@@ -68,7 +67,13 @@ pub fn app(state: AppState) -> Router {
                 .layer(TimeoutLayer::new(Duration::from_secs(5)))
                 .layer(middleware::from_fn(log)),
         )
-        .with_state(state)
+        .with_state(state);
+
+    #[cfg(not(debug_assertions))]
+    {
+        let router = router.fallback_service(web_service());
+    }
+    router
 }
 
 pub fn api_router(state: AppState) -> Router<AppState> {
@@ -109,6 +114,7 @@ fn access_token_auth_router(state: AppState) -> Router<AppState> {
         .layer(middleware::from_fn_with_state(state, validate_access_token))
 }
 
+#[cfg(not(debug_assertions))]
 fn web_service() -> ServeDir<ServeFile> {
     ServeDir::new(STATIC_ASSETS_PATH).fallback(ServeFile::new(INDEX_HTML_PATH))
 }