From d52d50ddda82196d9d7dd8b9a01bdf309372c96e Mon Sep 17 00:00:00 2001 From: vaishali K Date: Fri, 25 Jul 2025 18:19:10 +0530 Subject: [PATCH] Issue #000 feat: User service docker compose file with postgres --- .env.docker | 24 ++++++++++++++++++++++++ Dockerfile | 11 +++++++++-- docker-compose.yml | 30 +++++++++++++++++++++++------- 3 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 .env.docker diff --git a/.env.docker b/.env.docker new file mode 100644 index 00000000..a3df8faf --- /dev/null +++ b/.env.docker @@ -0,0 +1,24 @@ +SERVER_PORT=3000 +PORT=3010 +IMAGEPATH=./uploads +ADAPTERSOURCE=postgres +KEYCLOAK=https://keycloak-tekdi.org/auth/ +KEYCLOAK_ADMIN=admin/realms/master/users +KEYCLOAK_ADMIN=admin/realms/tekdi/users #creation in realm +KEYCLOAK_USER_TOKEN=realms/tekdi/protocol/openid-connect/token +KEYCLOAK_CLIENT_ID=Tekdi +KEYCLOAK_REALM=Tekdi +KEYCLOAK_CLIENT_SECRET=************* +KEYCLOAK_USERNAME=admin +KEYCLOAK_PASSWORD='**************' +KEYCLOAK_ADMIN_TOKEN=realms/master/protocol/openid-connect/token +RBAC_JWT_EXPIRES_IN=864000 +RBAC_JWT_SECRET=3609eeeab5d80e87****692139123****87872****** +KEYCLOAK_REALM_RSA_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----\/l3ctlyzVq+8uiQMCW/**********++/+GHuPy+/\n-----END PUBLIC KEY-----" +NOTIFICATION_URL=http://localhost:4001 +PASSWORD_RESET_JWT_EXPIRES_IN=3600000 +POSTGRES_HOST=postgres #Do not change this as postgres runs in a container with this name +POSTGRES_PORT=5431 +POSTGRES_DATABASE=postgresdb +POSTGRES_USERNAME=tekdi +POSTGRES_PASSWORD="*******" \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index b7649c97..92b3bfaa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,15 @@ +# Stage 1: Install dependencies FROM node:20 as dependencies -WORKDIR usr/src/app -COPY package*.json ./ +WORKDIR /usr/src/app +COPY package*.json ./ RUN npm install + +# Stage 2: Build and run +FROM node:20 as runner +WORKDIR /usr/src/app +COPY --from=dependencies /usr/src/app/node_modules ./node_modules COPY . . RUN npm run build + EXPOSE 3000 CMD ["npm", "start"] diff --git a/docker-compose.yml b/docker-compose.yml index b5fdaf96..0e9a65ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,27 @@ -version: "3.6" +version: '3.6' services: - backend: - image: shiksha-backend-2.0 - container_name: "shiksha-backend-2.0" - restart: always + user-service: + image: vaishali007/user-microservice:latest ports: - - 3000:3000 + - "3000:3000" env_file: - - /home/ubuntu-backend-shiksha2.0/.env + - .env.docker + depends_on: + - postgres + + postgres: + image: postgres:14 + container_name: postgres + restart: always + ports: + - "15432:5432" + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: oblf + volumes: + - pgdata:/var/lib/postgresql/data + +volumes: + pgdata: