fix: docker config

Author: zk-steve

Dockerfile

@@ -20,10 +20,15 @@ COPY . .
 RUN cargo build --release --target x86_64-unknown-linux-musl --bin cli
 
 FROM scratch AS prod
+WORKDIR /user
+COPY config/00-default.toml 00-default.toml
 COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/cli /usr/local/bin/rust-server
-CMD ["/usr/local/bin/rust-server"]
+ENTRYPOINT ["/usr/local/bin/rust-server", "--config-path=*.toml"]
 
-FROM prod AS dev
+FROM alpine AS dev
 WORKDIR /user
+COPY config/00-default.toml 00-default.toml
+COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/cli /usr/local/bin/rust-server
 COPY --from=bunyan /root/.cargo/bin/bunyan /usr/local/bin/
-CMD ["/usr/local/bin/rust-server | bunyan"]
+ENTRYPOINT ["/bin/sh"]
+CMD ["-c", "/usr/local/bin/rust-server --config-path=*.toml | bunyan"]

config/default.toml renamed to config/00-default.toml

@@ -4,14 +4,6 @@ exporter_endpoint = "http://localhost:7281"
 [db]
 [[inmemory]]
 
-[[pg]]
-user = 'postgres'
-password = 'postgres'
-host = '127.0.0.1'
-port = 5432
-dbname = 'rust_template_db'
-pool.max_size = 16
-
 [server]
 url = "0.0.0.0"
 port = 8000

deploy/docker/01-custom.toml

@@ -0,0 +1,13 @@
+service_name = "rust-api-server-docker"
+exporter_endpoint = "http://quickwit:7281"
+
+[server]
+url = "0.0.0.0"
+port = 8888
+
+[log]
+level = "info"
+
+[db.pg]
+url = "postgres://postgres:changeme@postgres:5432/postgres"
+max_size = 10

deploy/docker/docker-compose.yaml

@@ -1,28 +1,28 @@
-version: "3.3"
+version: "3.8"
 networks:
   rust-api-server:
-name: "rust-api-server-local"
+name: "rust-api-server-docker"
 services:
   quickwit:
     image: quickwit/quickwit:latest
     command: run
     restart: always
     environment:
-      QW_ENABLE_OTLP_ENDPOINT: 'true'
-      QW_ENABLE_JAEGER_ENDPOINT: 'true'
+      QW_ENABLE_OTLP_ENDPOINT: "true"
+      QW_ENABLE_JAEGER_ENDPOINT: "true"
     ports:
-      - '7280:7280'
-      - '7281:7281'
+      - "7280:7280"
+      - "7281:7281"
   jaeger:
     image: jaegertracing/jaeger-query:latest
     restart: always
     depends_on:
       - quickwit
     environment:
-      SPAN_STORAGE_TYPE: 'grpc-plugin'
-      GRPC_STORAGE_SERVER: 'quickwit:7281'
+      SPAN_STORAGE_TYPE: "grpc-plugin"
+      GRPC_STORAGE_SERVER: "quickwit:7281"
     ports:
-      - '16686:16686'
+      - "16686:16686"
   postgres:
     image: postgres
     environment:
@@ -33,5 +33,14 @@ services:
       - postgres:/data/postgres
     ports:
       - "5432:5432"
+  server:
+    image: rust-server
+    build:
+      context: ../..
+      target: dev
+    ports:
+      - "8888:8888"
+    volumes:
+      - ./01-custom.toml:/user/01-custom.toml:ro
 volumes:
   postgres: