Merge pull request #1228 from credebl/refactor/optimise-dockerfile

refactor: update dockerfile to reduce dockerimages

Author: KambleSahil3

Dockerfiles/Dockerfile.cloud-wallet

@@ -1,10 +1,9 @@
 # Stage 1: Build the application
-FROM node:18-slim as build
+FROM node:18-alpine AS build
 # Install OpenSSL
+RUN apk add --no-cache openssl
 RUN npm install -g pnpm
 
-RUN apt-get update -y
-RUN apt-get --no-install-recommends install -y openssl
 # Set the working directory
 WORKDIR /app
 
@@ -25,10 +24,10 @@ RUN cd libs/prisma-service && npx prisma generate
 RUN pnpm run build cloud-wallet
 
 # Stage 2: Create the final image
-FROM node:18-slim
+FROM node:18-alpine
+
+RUN apk add --no-cache openssl
 
-RUN apt-get update -y
-RUN apt-get --no-install-recommends install -y openssl
 # Set the working directory
 WORKDIR /app
 # RUN npm install -g pnpm

Dockerfiles/Dockerfile.seed

@@ -1,16 +1,18 @@
-FROM node:18 as build
+FROM node:18-alpine
 
 # Install pnpm
 RUN npm install -g pnpm
 
-# Install PostgreSQL client (use apt for Debian-based images)
-RUN apt-get update && apt-get install -y postgresql-client
+RUN apk add --no-cache postgresql-client openssl 
 
 # Set working directory
 WORKDIR /app
 
 COPY . .
+RUN chmod +x /app/libs/prisma-service/prisma/scripts/geo_location_data_import.sh
+RUN chmod +x /app/libs/prisma-service/prisma/scripts/update_client_credential_data.sh
 
+ENV PUPPETEER_SKIP_DOWNLOAD=true
 RUN pnpm i --ignore-scripts
 
 # Run Prisma commands

Dockerfiles/Dockerfile.user

@@ -1,32 +1,20 @@
 # Stage 1: Build the application
-FROM node:18-slim as build
-
-
+FROM node:18-alpine AS build
 
+# Install OpenSSL
+RUN apk add --no-cache openssl
 RUN npm install -g pnpm
 
-# We don't need the standalone Chromium
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-ENV PUPPETEER_SKIP_DOWNLOAD true
-
-# Install Google Chrome Stable and fonts
-# Note: this installs the necessary libs to make the browser work with Puppeteer.
-RUN apt-get update && apt-get install openssl gnupg wget -y && \
-    wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
-    sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
-    apt-get update && \
-    apt-get install google-chrome-stable -y --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
-
-# RUN apk update && apk list --all-versions chromium
 # Set the working directory
 WORKDIR /app
 
 # Copy package.json and package-lock.json
 COPY package.json ./
 
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
 # Install dependencies
-RUN pnpm install
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -37,24 +25,11 @@ RUN cd libs/prisma-service && npx prisma generate
 RUN pnpm run build user
 
 # Stage 2: Create the final image
-FROM node:18-slim
-
-# We don't need the standalone Chromium
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-ENV PUPPETEER_SKIP_DOWNLOAD true
-
-# Install Google Chrome Stable and fonts
-# Note: this installs the necessary libs to make the browser work with Puppeteer.
-RUN apt-get update && apt-get install openssl gnupg wget -y && \
-    wget --quiet --output-document=- https://dl-ssl.google.com/linux/linux_signing_key.pub | gpg --dearmor > /etc/apt/trusted.gpg.d/google-archive.gpg && \
-    sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
-    apt-get update && \
-    apt-get install google-chrome-stable -y --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
+FROM node:18-alpine
 
+RUN apk add --no-cache openssl
 # Set the working directory
 WORKDIR /app
-RUN npm install -g pnpm
 
 # Copy the compiled code from the build stage
 COPY --from=build /app/dist/apps/user/ ./dist/apps/user/

Dockerfiles/Dockerfile.utility

@@ -1,10 +1,9 @@
 # Stage 1: Build the application
-FROM node:18-slim as build
+FROM node:18-alpine AS build
 
+# Install OpenSSL
+RUN apk add --no-cache openssl
 RUN npm install -g pnpm
-
-RUN apt-get update -y
-RUN apt-get --no-install-recommends install -y openssl
 # Set the working directory
 WORKDIR /app
 
@@ -25,10 +24,9 @@ RUN cd libs/prisma-service && npx prisma generate
 RUN pnpm run build utility
 
 # Stage 2: Create the final image
-FROM node:18-slim
+FROM node:18-alpine
 
-RUN apt-get update -y
-RUN apt-get --no-install-recommends install -y openssl
+RUN apk add --no-cache openssl
 # Set the working directory
 WORKDIR /app
 # RUN npm install -g pnpm

libs/prisma-service/prisma/scripts/geo_location_data_import.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Database connection details
 DB_URL=$1

libs/prisma-service/prisma/scripts/update_client_credential_data.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Database connection URL
 DB_URL=$1
@@ -30,7 +30,7 @@ update_client_credentials() {
 }
 
 # Check if CLIENT_ID and CLIENT_SECRET are not empty
-if [[ -n "$CLIENT_ID" && -n "$CLIENT_SECRET" ]]; then
+if [ -n "$CLIENT_ID" ] && [ -n "$CLIENT_SECRET" ]; then
     # Update client credentials if both CLIENT_ID and CLIENT_SECRET are provided
     update_client_credentials
 else