Merge pull request #1079 from credebl/develop-dco-fixed

bhavanakarwade · web-flow · commit 31f10bd2a12b · 2024-11-18T13:52:20.000+05:30
merge: Develop to Qa
diff --git a/Dockerfiles/Dockerfile.agent-provisioning b/Dockerfiles/Dockerfile.agent-provisioning
@@ -17,8 +17,10 @@ WORKDIR /app
 # Copy package.json and package-lock.json
 COPY package.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
diff --git a/Dockerfiles/Dockerfile.agent-service b/Dockerfiles/Dockerfile.agent-service
@@ -15,8 +15,10 @@ WORKDIR /app
 # Copy package.json and package-lock.json
 COPY package.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -36,7 +38,7 @@ RUN npm install -g pnpm --ignore-scripts \
     && apk add docker \
     && apk add docker-compose 
 
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.api-gateway b/Dockerfiles/Dockerfile.api-gateway
@@ -8,8 +8,10 @@ WORKDIR /app
 COPY package.json ./
 # COPY package-lock.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -21,7 +23,7 @@ RUN pnpm run build api-gateway
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.cloud-wallet b/Dockerfiles/Dockerfile.cloud-wallet
@@ -10,8 +10,10 @@ WORKDIR /app
 # Copy package.json and package-lock.json
 COPY package.json ./
 
-# Install dependencies
-RUN pnpm install
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -28,7 +30,7 @@ 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
+# RUN npm install -g pnpm
 
 # Copy the compiled code from the build stage
 COPY --from=build /app/dist/apps/cloud-wallet/ ./dist/apps/cloud-wallet/
diff --git a/Dockerfiles/Dockerfile.connection b/Dockerfiles/Dockerfile.connection
@@ -8,8 +8,10 @@ WORKDIR /app
 COPY package.json ./
 #COPY package-lock.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -21,7 +23,7 @@ RUN pnpm run build connection
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.geolocation b/Dockerfiles/Dockerfile.geolocation
@@ -8,8 +8,10 @@ WORKDIR /app
 COPY package.json ./
 #COPY package-lock.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -21,7 +23,7 @@ RUN pnpm run build geo-location
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.issuance b/Dockerfiles/Dockerfile.issuance
@@ -8,8 +8,10 @@ WORKDIR /app
 COPY package.json ./
 #COPY package-lock.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -21,7 +23,7 @@ RUN pnpm run build issuance
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.ledger b/Dockerfiles/Dockerfile.ledger
@@ -8,8 +8,10 @@ WORKDIR /app
 COPY package.json ./
 #COPY package-lock.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -22,7 +24,7 @@ RUN npm run build ledger
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.notification b/Dockerfiles/Dockerfile.notification
@@ -22,7 +22,7 @@ RUN npm run build notification
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm --ignore-scripts
+# RUN npm install -g pnpm --ignore-scripts
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.organization b/Dockerfiles/Dockerfile.organization
@@ -7,8 +7,10 @@ WORKDIR /app
 # Copy package.json and package-lock.json
 COPY package.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -22,7 +24,7 @@ RUN pnpm run build organization
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.utility b/Dockerfiles/Dockerfile.utility
@@ -10,8 +10,10 @@ WORKDIR /app
 # Copy package.json and package-lock.json
 COPY package.json ./
 
-# Install dependencies
-RUN pnpm install
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -28,7 +30,7 @@ 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
+# RUN npm install -g pnpm
 
 # Copy the compiled code from the build stage
 COPY --from=build /app/dist/apps/utility/ ./dist/apps/utility/
diff --git a/Dockerfiles/Dockerfile.verification b/Dockerfiles/Dockerfile.verification
@@ -7,8 +7,10 @@ WORKDIR /app
 # Copy package.json and package-lock.json
 COPY package.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -20,7 +22,7 @@ RUN npm run build verification
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/Dockerfiles/Dockerfile.webhook b/Dockerfiles/Dockerfile.webhook
@@ -8,8 +8,10 @@ WORKDIR /app
 COPY package.json ./
 #COPY package-lock.json ./
 
-# Install dependencies
-RUN pnpm i
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
+# Install dependencies while ignoring scripts (including Puppeteer's installation)
+RUN pnpm i --ignore-scripts
 
 # Copy the rest of the application code
 COPY . .
@@ -21,7 +23,7 @@ RUN pnpm run build webhook
 
 # Stage 2: Create the final image
 FROM node:18-alpine
-RUN npm install -g pnpm
+# RUN npm install -g pnpm
 # Set the working directory
 WORKDIR /app
 
diff --git a/apps/agent-provisioning/AFJ/scripts/docker_start_agent.sh b/apps/agent-provisioning/AFJ/scripts/docker_start_agent.sh
@@ -91,14 +91,14 @@ if [ -d "${PWD}/agent-provisioning/AFJ/endpoints" ]; then
   echo "Endpoints directory exists."
 else
   echo "Error: Endpoints directory does not exists."
-  mkdir ${PWD}/agent-provisioning/AFJ/endpoints
+  mkdir -p ${PWD}/agent-provisioning/AFJ/endpoints
 fi
 
 if [ -d "${PWD}/agent-provisioning/AFJ/agent-config" ]; then
   echo "Endpoints directory exists."
 else
   echo "Error: Endpoints directory does not exists."
-  mkdir ${PWD}/agent-provisioning/AFJ/agent-config
+  mkdir -p ${PWD}/agent-provisioning/AFJ/agent-config
 fi
 
 AGENT_ENDPOINT="${PROTOCOL}://${EXTERNAL_IP}:${INBOUND_PORT}"
diff --git a/apps/organization/src/organization.service.ts b/apps/organization/src/organization.service.ts
@@ -636,9 +636,6 @@ export class OrganizationService {
           orgIds = organizations?.map(item => item.id);
         
         const orgEcosystemDetails = await this._getOrgEcosystems(orgIds);
-        if (!orgEcosystemDetails || !Array.isArray(orgEcosystemDetails) || 0 === orgEcosystemDetails.length) {
-          throw new NotFoundException(ResponseMessages.ecosystem.error.ecosystemDetailsNotFound);
-        }
     
         updatedOrgs = getOrgs.organizations.map(org => {
           const matchingEcosystems = orgEcosystemDetails
diff --git a/libs/common/src/response-messages/index.ts b/libs/common/src/response-messages/index.ts
@@ -385,11 +385,7 @@ export const ResponseMessages = {
     notFound: 'Not Found',
     serverError: 'Internal Server error'
   },
-  ecosystem: {
-    error: {
-      ecosystemDetailsNotFound: 'Ecosystem details not found'
-    }
-  },
+  
   webhook: {
     success: {
       webhookUrlRegister: 'Webhook Url registered successfully',
