feat: add news service to deployment

* rename api service to users service

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 
 members = [
-  "api",
+  "users",
   "consumer",
   "utils",
   "news"

Makefile

@@ -17,9 +17,11 @@ test:
 
 
 build-prod:
-	docker build -t ffff/rust-api-prod -f ./docker.prod/Dockerfile.api  .
+	docker build -t ffff/rust-users-prod -f ./docker.prod/Dockerfile.users  .
+	docker build -t ffff/rust-news-prod -f ./docker.prod/Dockerfile.news  .
 	docker build -t ffff/rust-fe-prod -f ./docker.prod/Dockerfile.fe  .
-	docker build -t ffff/rust-migrations-prod -f ./docker.prod/Dockerfile.migrations  .
+	docker build -t ffff/rust-users-migrations-prod -f ./docker.prod/Dockerfile.users-migrations  .
+	docker build -t ffff/rust-news-migrations-prod -f ./docker.prod/Dockerfile.news-migrations  .
 	docker build -t ffff/rust-consumer-prod -f ./docker.prod/Dockerfile.consumer  .
 
 deploy-k8s:

docker-compose.yaml

@@ -55,22 +55,22 @@ services:
     volumes:
       - ./data/kafka:/var/lib/kafka/data
 
-  api:
+  users:
     build:
       context: .
-      dockerfile: ./api/Dockerfile.dev
+      dockerfile: ./users/Dockerfile.dev
     ports:
       - 8000:8000
     volumes:
-      - ./api/src:/app/api/src
+      - ./users/src:/app/users/src
       - ./utils/src:/app/utils/src
-      - ./logs/api:/var/log/app
+      - ./logs/users:/var/log/app
     environment:
       CORS_ORIGIN: http://localhost:3000
       DATABASE_URL: "postgres://myuser:mypassword@postgres:5432/mydb?options=-c%20search_path%3Dusers"
       JWT_EXPIRED_IN: 60
       JWT_MAX_AGE: 3600
-      JWT_SECRET: api-secret-1234
+      JWT_SECRET: users-secret-1234
       KAFKA_URL: kafka:29092
       LOGS_PATH: /var/log/app/stdout.log
       PORT: 8000
@@ -80,12 +80,12 @@ services:
         condition: service_healthy
       kafka:
         condition: service_healthy
-      api-migrations:
+      users-migrations:
         condition: service_completed_successfully
 
-  api-migrations:
+  users-migrations:
     build:
-      context: ./api
+      context: ./users
       dockerfile: Dockerfile.migrations
     environment:
       RUST_LOG: info
@@ -156,5 +156,5 @@ services:
     ports:
       - 3000:3000
     depends_on:
-      - api
+      - users
       - news

docker.prod/Dockerfile.news

@@ -0,0 +1,56 @@
+ARG RUST_VERSION=1.72.0
+ARG APP_NAME=news
+FROM rust:${RUST_VERSION}-slim-bullseye AS build
+ARG APP_NAME
+WORKDIR /app
+
+# dependencies to compile the Kafka client
+RUN apt-get update && apt-get install -y build-essential \
+  curl \
+  openssl libssl-dev \
+  pkg-config \
+  python \
+  valgrind \
+  zlib1g-dev
+
+# dependencies to compile diesel client
+RUN apt-get install -y  \
+  libpq-dev
+
+RUN echo "[workspace]\n\
+  members = [\n\
+  \"news\",\n\
+  \"utils\"\n\
+  ]" > ./Cargo.toml
+
+COPY ./news/Cargo.toml ./news/
+COPY ./utils/Cargo.toml ./utils/
+
+RUN mkdir news/src
+RUN echo "fn main() {}" > ./news/src/main.rs
+
+RUN mkdir utils/src
+RUN echo "fn main() {}" > ./utils/src/main.rs
+
+RUN cargo build --release
+
+COPY ./utils/src ./utils/src
+COPY ./news/src ./news/src
+
+RUN cargo build --release
+
+RUN cp ./target/release/$APP_NAME /bin/server
+
+
+FROM debian:bullseye-slim AS final
+
+RUN apt-get update && apt-get install -y  \
+  libpq-dev \
+  openssl libssl-dev \
+  ca-certificates
+
+COPY --from=build /bin/server /bin/
+
+EXPOSE 8001
+
+CMD ["/bin/server"]

docker.prod/Dockerfile.migrations → docker.prod/Dockerfile.news-migrations

@@ -1,5 +1,5 @@
 ARG RUST_VERSION=1.72.0
-ARG APP_NAME=api
+ARG APP_NAME=news
 FROM rust:${RUST_VERSION}-slim-bullseye AS build
 ARG APP_NAME
 WORKDIR /app
@@ -9,6 +9,6 @@ RUN apt-get update && apt-get install -y  \
 
 RUN cargo install  diesel_cli --no-default-features --features postgres
 
-COPY ./api/migrations /app/migrations
+COPY ./news/migrations /app/migrations
 
 CMD ["diesel","migration","run"]

docker.prod/Dockerfile.api → docker.prod/Dockerfile.users

@@ -1,5 +1,5 @@
 ARG RUST_VERSION=1.72.0
-ARG APP_NAME=api
+ARG APP_NAME=users
 FROM rust:${RUST_VERSION}-slim-bullseye AS build
 ARG APP_NAME
 WORKDIR /app
@@ -19,23 +19,23 @@ RUN apt-get install -y  \
 
 RUN echo "[workspace]\n\
   members = [\n\
-  \"api\",\n\
+  \"users\",\n\
   \"utils\"\n\
   ]" > ./Cargo.toml
 
-COPY ./api/Cargo.toml ./api/Cargo.lock ./api/
+COPY ./users/Cargo.toml ./users/Cargo.lock ./users/
 COPY ./utils/Cargo.toml ./utils/
 
-RUN mkdir api/src
-RUN echo "fn main() {}" > ./api/src/main.rs
+RUN mkdir users/src
+RUN echo "fn main() {}" > ./users/src/main.rs
 
 RUN mkdir utils/src
 RUN echo "fn main() {}" > ./utils/src/main.rs
 
 RUN cargo build --release
 
 COPY ./utils/src ./utils/src
-COPY ./api/src ./api/src
+COPY ./users/src ./users/src
 
 RUN cargo build --release
 

docker.prod/Dockerfile.users-migrations

@@ -0,0 +1,14 @@
+ARG RUST_VERSION=1.72.0
+ARG APP_NAME=users
+FROM rust:${RUST_VERSION}-slim-bullseye AS build
+ARG APP_NAME
+WORKDIR /app
+
+RUN apt-get update && apt-get install -y  \
+  libpq-dev
+
+RUN cargo install  diesel_cli --no-default-features --features postgres
+
+COPY ./users/migrations /app/migrations
+
+CMD ["diesel","migration","run"]

frontend/src/setupProxy.js

@@ -35,7 +35,7 @@ module.exports = function (app) {
     .use(
       '/api/auth',
       createProxyMiddleware({
-        target: 'http://api:8000',
+        target: 'http://users:8000',
         changeOrigin: true,
         pathRewrite: {
           '^/api/': '/',
@@ -45,7 +45,7 @@ module.exports = function (app) {
     .use(
       '/ws',
       createProxyMiddleware({
-        target: 'ws://api:8000',
+        target: 'ws://users:8000',
         changeOrigin: true,
       })
     );