fix: config files

Author: zk-steve

Dockerfile

@@ -20,16 +20,30 @@ COPY . .
 RUN cargo build --release --all
 RUN mv target/${CARGO_BUILD_TARGET}/release /out
 
-FROM scratch AS prod
+FROM scratch AS public_server_prod
 WORKDIR /user
 COPY src/public/config/00-default.toml 00-default.toml
-COPY --from=builder /out/cli /usr/local/bin/rust-server
-ENTRYPOINT ["/usr/local/bin/rust-server", "--config-path=*.toml"]
+COPY --from=builder /out/public_server /usr/local/bin/public_server
+ENTRYPOINT ["/usr/local/bin/public_server", "--config-path=*.toml"]
 
-FROM alpine AS dev
+FROM alpine AS public_server_dev
 WORKDIR /user
 COPY src/public/config/00-default.toml 00-default.toml
-COPY --from=builder /out/cli /usr/local/bin/rust-server
+COPY --from=builder /out/public_server /usr/local/bin/public_server
 COPY --from=bunyan /root/.cargo/bin/bunyan /usr/local/bin/
 ENTRYPOINT ["/bin/sh"]
-CMD ["-c", "/usr/local/bin/rust-server --config-path=*.toml | bunyan"]
+CMD ["-c", "/usr/local/bin/public_server --config-path=*.toml | bunyan"]
+
+FROM scratch AS gpt_answer_server_prod
+WORKDIR /user
+COPY src/public/config/00-default.toml 00-default.toml
+COPY --from=builder /out/public_server /usr/local/bin/public_server
+ENTRYPOINT ["/usr/local/bin/public_server", "--config-path=*.toml"]
+
+FROM alpine AS gpt_answer_server_dev
+WORKDIR /user
+COPY src/public/config/00-default.toml 00-default.toml
+COPY --from=builder /out/public_server /usr/local/bin/public_server
+COPY --from=bunyan /root/.cargo/bin/bunyan /usr/local/bin/
+ENTRYPOINT ["/bin/sh"]
+CMD ["-c", "/usr/local/bin/public_server --config-path=*.toml | bunyan"]

Makefile

@@ -28,12 +28,12 @@ build:
 	PKG_NAME=rust-api-server
 	BUILD_VERSION=$(shell git describe --long)
 	BUILD_RELEASE=$(shell git describe --tags --abbrev=0)
-	BUILDKIT_PROGRESS=plain
-	DOCKER_BUILDKIT=1
-	docker build --ssh default -t $(PKG_NAME):$(BUILD_VERSION) --target=prod .
+	BUILDKIT_PROGRESS=plain	docker build --ssh default -t $(PKG_NAME):$(BUILD_VERSION) --target=public_server_prod .
+	BUILDKIT_PROGRESS=plain	docker build --ssh default -t $(PKG_NAME):$(BUILD_VERSION) --target=gpt_answer_server_prod .
 
 build-dev:
-	BUILDKIT_PROGRESS=plain DOCKER_BUILDKIT=1 docker build --ssh default -t $(PKG_NAME):$(BUILD_VERSION) --target=dev .
+	BUILDKIT_PROGRESS=plain DOCKER_BUILDKIT=1 docker build --ssh default -t $(PKG_NAME):$(BUILD_VERSION) --target=public_server_dev .
+	BUILDKIT_PROGRESS=plain DOCKER_BUILDKIT=1 docker build --ssh default -t $(PKG_NAME):$(BUILD_VERSION) --target=gpt_answer_server_dev .
 
 profiling-public:
 	CARGO_PROFILE_RELEASE_DEBUG=true cargo flamegraph --root -- -c ./src/public/config/* -c ./deploy/local/custom.toml

deploy/docker/01-custom.toml renamed to deploy/docker/01_public_custom.toml

@@ -13,5 +13,5 @@ url = "postgres://postgres:changeme@postgres:5432/postgres"
 max_size = 10
 
 [redis]
-host = "0.0.0.0"
+host = "redis"
 port = 6379

deploy/docker/docker-compose.yaml

@@ -33,11 +33,11 @@ services:
       - postgres:/data/postgres
     ports:
       - "5432:5432"
-  server:
-    image: rust-server
+  public_server:
+    image: public_server
     build:
       context: ../..
-      target: dev
+      target: public_server_dev
     ports:
       - "8888:8888"
     volumes:

deploy/local/docker-compose.yaml

@@ -33,5 +33,9 @@ services:
       - postgres:/data/postgres
     ports:
       - "5432:5432"
+  redis:
+    image: redis:alpine
+    ports:
+      - "6379:6379"
 volumes:
   postgres:

deploy/local/custom.toml renamed to deploy/local/public_custom.toml

@@ -8,4 +8,8 @@ level = "info"
 
 [db.pg]
 url = "postgres://postgres:changeme@localhost:5432/postgres"
-max_size = 100
+max_size = 100
+
+[redis]
+host = "0.0.0.0"
+port = 6379

src/gpt_answer_server/config/00-default.toml

@@ -1,7 +1,7 @@
-service_name = "rust-grpc-server"
+service_name = "gpt_answer_server"
 exporter_endpoint = "http://localhost:7281"
 server_endpoint = "0.0.0.0:50051"
 
 [redis]
-host = "0.0.0.0"
+host = "redis"
 port = 6379

src/public/Cargo.toml

@@ -3,7 +3,7 @@ example = []
 
 [[bin]]
 path = "src/main.rs"
-name = "cli"
+name = "public_server"
 test = true
 doctest = true
 bench = true

src/public/config/00-default.toml

@@ -1,4 +1,4 @@
-service_name = "rust-api-server"
+service_name = "public_server"
 exporter_endpoint = "http://localhost:7281"
 gpt_answer_service_url = "grpc://0.0.0.0:50051"