Skip to content

Commit

Permalink
merge: develop to qa (#723)
Browse files Browse the repository at this point in the history
* Docker file changes comment npx generate and migrate

Signed-off-by: KambleSahil3 <[email protected]>

* comment puppeter installation in utility

Signed-off-by: KambleSahil3 <[email protected]>

* yarn.lock fie

Signed-off-by: KambleSahil3 <[email protected]>

* added primsa generate and mirgate in first stage

Signed-off-by: KambleSahil3 <[email protected]>

* refactor: ledger api

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: create schema api

Signed-off-by: bhavanakarwade <[email protected]>

* resolved sonar lint checks

Signed-off-by: bhavanakarwade <[email protected]>

* fix: modify database column name

Signed-off-by: bhavanakarwade <[email protected]>

* fix: modify validation message

Signed-off-by: bhavanakarwade <[email protected]>

* fix: security vulnerabilities

Signed-off-by: pranalidhanavade <[email protected]>

* added only npx deploy in CMD

Signed-off-by: KambleSahil3 <[email protected]>

* fix: security issues

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: env sample

Signed-off-by: bhavanakarwade <[email protected]>

* fix: API error for get credef by id (#656)

Signed-off-by: Krishna <[email protected]>

* refactor: updated webauthn version to latest (9.0.3) (#657)

* fido version updated

Signed-off-by: tipusinghaw <[email protected]>

* fix: email auth issue

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* fix: http method for delete

Signed-off-by: sanjay.khatal <[email protected]>

* refactor: ledger table

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: update import of enum

Signed-off-by: bhavanakarwade <[email protected]>

* fix: added the validation for the pageNumber and pageSize

Signed-off-by: KulkarniShashank <[email protected]>

* refactor: cred-def controller APIs (#661)

* refactor: get all cred defs api

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: cred def controller apis

Signed-off-by: bhavanakarwade <[email protected]>

* resolved comments

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: update import

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: update import of enum

Signed-off-by: bhavanakarwade <[email protected]>

* Changed stage 1:npx commands to migrate and generate in dockerfiles

Signed-off-by: KambleSahil3 <[email protected]>

* fix: added the organization name validation

Signed-off-by: KulkarniShashank <[email protected]>

* fix: validation for UUID fixed for connectionId in proof

Signed-off-by: Krishna <[email protected]>

* fix: path traversal for updating org details

Signed-off-by: Krishna <[email protected]>

* fix: added the validation in connection and ecosystem module for sql-injection

Signed-off-by: KulkarniShashank <[email protected]>

* Removed all unnecessary comments

Signed-off-by: KambleSahil3 <[email protected]>

* refactor: interface parameters

Signed-off-by: bhavanakarwade <[email protected]>

* fix: added the decode URI component in main.ts

Signed-off-by: KulkarniShashank <[email protected]>

* fix: added the messages for the invalid URL

Signed-off-by: KulkarniShashank <[email protected]>

* fix: logo uri validation in image update for org for security testing

Signed-off-by: Krishna <[email protected]>

* fix: update validation for empty string for logo

Signed-off-by: Krishna <[email protected]>

* fix: name validation in update org

Signed-off-by: Krishna <[email protected]>

* refactor:added `outOfBandId` into issuance webhook (#669)

* refactor:added outOfBandId into issuance webhook

Signed-off-by: pallavicoder <[email protected]>

* chore:added type as null and string

Signed-off-by: pallavicoder <[email protected]>

---------

Signed-off-by: pallavicoder <[email protected]>

* feat: multi-did creation implementation for an organization (#667)

* feat: multi did support

Signed-off-by: tipusinghaw <[email protected]>

* refactor: added validation

Signed-off-by: tipusinghaw <[email protected]>

* refactor: added logic for pervious primary DID

Signed-off-by: tipusinghaw <[email protected]>

* refactor: changed primaryDid and added size to did veriable

Signed-off-by: tipusinghaw <[email protected]>

* fix: resloved commits

Signed-off-by: tipusinghaw <[email protected]>

* fix: updated the import url

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* feat: multiselect connection while issuance (#629)

* feat: multiselect connections while issuance

Signed-off-by: bhavanakarwade <[email protected]>

* feat: multi select connections functionality while issuance

Signed-off-by: bhavanakarwade <[email protected]>

* feat: multi select connections

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: modify error message

Signed-off-by: bhavanakarwade <[email protected]>

* fix: resolved comments

Signed-off-by: bhavanakarwade <[email protected]>

* resolved comments

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* fix: fix wallet spinup dto issue (#675)

Signed-off-by: tipusinghaw <[email protected]>

* add name attribute in w3c presentationDefinition payload (#678)

Signed-off-by: Ankita Patidar <[email protected]>

* add name attribute in w3c presentationDefinition payload

Signed-off-by: Ankita Patidar <[email protected]>

* add name attribute in w3c presentationDefinition payload

Signed-off-by: Ankita Patidar <[email protected]>

* fix: add hotfixes from main

Signed-off-by: Krishna <[email protected]>

* update validation on creddef field, optional for jsonld

Signed-off-by: Ankita Patidar <[email protected]>

* feat: add organization(s) into ecosystem (#670)

* feat: add self orgs in ecosystem

Signed-off-by: bhavanakarwade <[email protected]>

* feat: update return types

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: error handling

Signed-off-by: bhavanakarwade <[email protected]>

* feat: add role filter in get all organization api

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: get all organizations dto

Signed-off-by: bhavanakarwade <[email protected]>

* feat: apply filter for role

Signed-off-by: bhavanakarwade <[email protected]>

* feat: applied validation for uuid

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: nats message

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: improve error handling

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: applied uuid validation for ecosystemId

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: add organization function

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added organization functionality

Signed-off-by: bhavanakarwade <[email protected]>

* fix: handled empty array condition

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: added organization into ecosystem with network validation

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: find ecosystem member functionality

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* added openssl installation

Signed-off-by: KambleSahil3 <[email protected]>

* Update Dockerfile.utility fixed Sonar cloud issues

Update Dockerfile.utility fixed Sonar cloud issues

Signed-off-by: KambleSahil3 <[email protected]>

* feat: implement w3c credential offer functionality with connection id

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: dto example

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: remove legacy connection invitation

Signed-off-by: KulkarniShashank <[email protected]>

* refactor: solved duplication error in agent-service

Signed-off-by: KulkarniShashank <[email protected]>

* fix: set primary did issue (#691)

Signed-off-by: tipusinghaw <[email protected]>

* Feat/verification w3c with connection (#690)

* Add: w3c verification with connection

Signed-off-by: Krishna <[email protected]>

* Added: validations

Signed-off-by: Krishna <[email protected]>

* Remove commented code

Signed-off-by: Krishna <[email protected]>

* fix: sonarlint issues

Signed-off-by: Krishna <[email protected]>

* fix: sonarlint issues

Signed-off-by: Krishna <[email protected]>

* Add: validations

Signed-off-by: Krishna <[email protected]>

---------

Signed-off-by: Krishna <[email protected]>

* add: zap changes merged from main

Signed-off-by: Krishna <[email protected]>

* feat: w3c credential for issuance by multiple sconnection id

Signed-off-by: bhavanakarwade <[email protected]>

* feat:add-invitation-did-for-reuse-connection

Signed-off-by: pallavicoder <[email protected]>

* feat: fetch all credential definitions from platform (#684)

* feat: get all platform cred defs

Signed-off-by: bhavanakarwade <[email protected]>

* reafctor: modify get all platform cred defs dto

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* fix: transaction request message (bug) (#686)

* fix: transaction request message

Signed-off-by: bhavanakarwade <[email protected]>

* refactor: response message

Signed-off-by: bhavanakarwade <[email protected]>

---------

Signed-off-by: bhavanakarwade <[email protected]>

* Added goalCode in OOB presentationRequest payload

Signed-off-by: Ankita Patidar <[email protected]>

* fix: example in DTO

Signed-off-by: Krishna <[email protected]>

* fix: triming issues while getting all credential definitions by schema Id

Signed-off-by: Krishna <[email protected]>

* fix: store did document while creating did (#706)

* fix: set primary did issue

Signed-off-by: tipusinghaw <[email protected]>

* fix: did documentation issue

Signed-off-by: tipusinghaw <[email protected]>

* changes error message in get did details

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* fix/feat : Updated W3C schema response and Implemented schema store logic (#714)

* feat: added logic to store W3C schema

Signed-off-by: tipusinghaw <[email protected]>

* fix: Error messages

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* fix: did service endpoint while creating DID (#715)

* feat: added logic to store W3C schema

Signed-off-by: tipusinghaw <[email protected]>

* fix: Error messages

Signed-off-by: tipusinghaw <[email protected]>

* fix: did endpoint

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* refactor: updated sh file to pass schema manager URL (#716)

* feat: added logic to store W3C schema

Signed-off-by: tipusinghaw <[email protected]>

* fix: Error messages

Signed-off-by: tipusinghaw <[email protected]>

* fix: did endpoint

Signed-off-by: tipusinghaw <[email protected]>

* refactor: updated sh file

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* feat: on-premises agent configuration and spin-up

Signed-off-by: KulkarniShashank <[email protected]>

* fix: example in DTO

Signed-off-by: Krishna <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>

* fix: store did document while creating did (#706)

* fix: set primary did issue

Signed-off-by: tipusinghaw <[email protected]>

* fix: did documentation issue

Signed-off-by: tipusinghaw <[email protected]>

* changes error message in get did details

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>

* feat: on-premises connection invitation creation

Signed-off-by: KulkarniShashank <[email protected]>

* refactor: Added seprate method for agent configure

Signed-off-by: KulkarniShashank <[email protected]>

* fix: solved the sonarlint issues

Signed-off-by: KulkarniShashank <[email protected]>

* fix: solved the docker command as per version

Signed-off-by: KulkarniShashank <[email protected]>

* fix: solved the bug when store the dedicated connection, issuance and verification

Signed-off-by: KulkarniShashank <[email protected]>

* fix: resolved the error handling in agent config method

Signed-off-by: KulkarniShashank <[email protected]>

* fix/feat : Updated W3C schema response and Implemented schema store logic (#714)

* feat: added logic to store W3C schema

Signed-off-by: tipusinghaw <[email protected]>

* fix: Error messages

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>

* fix: did service endpoint while creating DID (#715)

* feat: added logic to store W3C schema

Signed-off-by: tipusinghaw <[email protected]>

* fix: Error messages

Signed-off-by: tipusinghaw <[email protected]>

* fix: did endpoint

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>

* fix: did service endpoint while creating DID (#715)

* feat: added logic to store W3C schema

Signed-off-by: tipusinghaw <[email protected]>

* fix: Error messages

Signed-off-by: tipusinghaw <[email protected]>

* fix: did endpoint

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>

* Added the error logger in agent configure

Signed-off-by: KulkarniShashank <[email protected]>

* fix/feat : Updated W3C schema response and Implemented schema store logic (#714)

* feat: added logic to store W3C schema

Signed-off-by: tipusinghaw <[email protected]>

* fix: Error messages

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>

* fix: validation for inboundEndpoint domain

Signed-off-by: KulkarniShashank <[email protected]>

* fix: remove json files

Signed-off-by: KulkarniShashank <[email protected]>

* fix: remove unnecessary files

Signed-off-by: KulkarniShashank <[email protected]>

* fix: added validation for wallet name

Signed-off-by: KulkarniShashank <[email protected]>

* fix/w3c schema (#721)

* feat: added logic to store W3C schema

Signed-off-by: tipusinghaw <[email protected]>

* fix: Error messages

Signed-off-by: tipusinghaw <[email protected]>

* fix: did endpoint

Signed-off-by: tipusinghaw <[email protected]>

* refactor: updated sh file

Signed-off-by: tipusinghaw <[email protected]>

---------

Signed-off-by: tipusinghaw <[email protected]>

* Added the logger in agent configure function

Signed-off-by: KulkarniShashank <[email protected]>

---------

Signed-off-by: KambleSahil3 <[email protected]>
Signed-off-by: bhavanakarwade <[email protected]>
Signed-off-by: pranalidhanavade <[email protected]>
Signed-off-by: Krishna <[email protected]>
Signed-off-by: tipusinghaw <[email protected]>
Signed-off-by: sanjay.khatal <[email protected]>
Signed-off-by: KulkarniShashank <[email protected]>
Signed-off-by: pallavicoder <[email protected]>
Signed-off-by: Ankita Patidar <[email protected]>
Signed-off-by: KambleSahil3 <[email protected]>
Co-authored-by: KambleSahil3 <[email protected]>
Co-authored-by: bhavanakarwade <[email protected]>
Co-authored-by: pranalidhanavade <[email protected]>
Co-authored-by: Sanjay Khatal <[email protected]>
Co-authored-by: Krishna <[email protected]>
Co-authored-by: tipusinghaw <[email protected]>
Co-authored-by: sanjay.khatal <[email protected]>
Co-authored-by: bhavanakarwade <[email protected]>
Co-authored-by: Krishna <[email protected]>
Co-authored-by: Sheetal-ayanworks <[email protected]>
Co-authored-by: pallavighule <[email protected]>
Co-authored-by: Ankita Patidar <[email protected]>
Co-authored-by: Ankita Patidar <[email protected]>
Co-authored-by: Sai Ranjit Tummalapalli <[email protected]>
Co-authored-by: KambleSahil3 <[email protected]>
Co-authored-by: pallavicoder <[email protected]>
  • Loading branch information
17 people committed May 17, 2024
1 parent baa1f12 commit 2146b9a
Show file tree
Hide file tree
Showing 127 changed files with 12,422 additions and 1,426 deletions.
4 changes: 3 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,6 @@ KEYCLOAK_ADMIN_URL=http://localhost:8080
KEYCLOAK_MASTER_REALM=xxxxxxx
KEYCLOAK_MANAGEMENT_CLIENT_ID=xxxxxxx
KEYCLOAK_MANAGEMENT_CLIENT_SECRET=xxxxxxx
KEYCLOAK_REALM=xxxxxxx
KEYCLOAK_REALM=xxxxxxx

ENABLE_CORS_IP_LIST="" # Provide a list of domains that are allowed to use this server
29 changes: 5 additions & 24 deletions Dockerfiles/Dockerfile.agent-provisioning
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
# Stage 1: Build the application
FROM node:18-alpine as build
# RUN npm install -g pnpm
# Install AWS CLI
# RUN apk update
# RUN apk add openssh-client
# RUN apk update
# RUN apk add aws-cli

RUN set -eux \
&& apk --no-cache add \
openssh-client \
Expand All @@ -16,14 +11,6 @@ RUN set -eux \
&& export PATH=$PATH:/usr/lib/node_modules/pnpm/bin \
&& rm -rf /var/cache/apk/*

RUN docker --version && \
docker-compose --version

ARG ROOT_PATH
ENV ROOT_PATH ${ROOT_PATH}

RUN echo "ROOT_PATH is set to: $ROOT_PATH"

# Set the working directory
WORKDIR /app

Expand All @@ -37,19 +24,16 @@ RUN pnpm i
COPY . .

# Generate Prisma client
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate
RUN ls -R /app/apps/agent-provisioning/AFJ/

# Build the user service
RUN pnpm run build agent-provisioning

# Stage 2: Create the final image
FROM node:18-alpine as prod
# Install AWS CLI
# RUN apk update
# RUN apk add openssh-client
# RUN apk update
# RUN apk add aws-cli

RUN set -eux \
&& apk --no-cache add \
openssh-client \
Expand Down Expand Up @@ -86,7 +70,4 @@ RUN chmod 777 /app/agent-provisioning/AFJ/token
COPY libs/ ./libs/

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/agent-provisioning/main.js $ROOT_PATH"]

# docker build -t agent-provisioning-service -f Dockerfiles/Dockerfile.agent-provisioning .
# docker run -d --env-file .env --name agent-provisioning-service docker.io/library/agent-provisioning-service
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/agent-provisioning/main.js"]
9 changes: 3 additions & 6 deletions Dockerfiles/Dockerfile.agent-service
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate

# Build the user service
RUN pnpm run build agent-service
Expand Down Expand Up @@ -48,8 +49,4 @@ COPY --from=build /app/libs/ ./libs/
COPY --from=build /app/node_modules ./node_modules

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma migrate deploy && cd ../.. && node dist/apps/agent-service/main.js"]

# docker build -t agent-service -f Dockerfiles/Dockerfile.agent-service .
# docker run -d --env-file .env --name agent-service docker.io/library/agent-service
# docker logs -f agent-service
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/agent-service/main.js"]
5 changes: 3 additions & 2 deletions Dockerfiles/Dockerfile.api-gateway
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate

# Build the api-gateway service
RUN pnpm run build api-gateway
Expand All @@ -33,4 +34,4 @@ COPY --from=build /app/node_modules ./node_modules
# COPY --from=build /app/uploadedFiles ./uploadedFiles

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/api-gateway/main.js"]
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/api-gateway/main.js"]
9 changes: 3 additions & 6 deletions Dockerfiles/Dockerfile.connection
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate

# Build the connection service
RUN pnpm run build connection
Expand All @@ -36,8 +37,4 @@ COPY --from=build /app/node_modules ./node_modules
#RUN npm i --only=production

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/connection/main.js"]

# docker build -t connection -f Dockerfiles/Dockerfile.connection .
# docker run -d --env-file .env --name connection docker.io/library/connection
# docker logs -f connection
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/connection/main.js"]
9 changes: 3 additions & 6 deletions Dockerfiles/Dockerfile.ecosystem
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate

# Build the issuance service
RUN pnpm run build ecosystem
Expand All @@ -34,8 +35,4 @@ COPY --from=build /app/node_modules ./node_modules


# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/ecosystem/main.js"]

# docker build -t ecosystem -f Dockerfiles/Dockerfile.ecosystem .
# docker run -d --env-file .env --name ecosystem docker.io/library/ecosystem
# docker logs -f ecosystem
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/ecosystem/main.js"]
10 changes: 4 additions & 6 deletions Dockerfiles/Dockerfile.issuance
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate


# Build the issuance service
RUN pnpm run build issuance
Expand All @@ -35,8 +37,4 @@ COPY --from=build /app/node_modules ./node_modules


# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/issuance/main.js"]

# docker build -t issuance -f Dockerfiles/Dockerfile.issuance .
# docker run -d --env-file .env --name issuance docker.io/library/issuance
# docker logs -f issuance
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/issuance/main.js"]
10 changes: 4 additions & 6 deletions Dockerfiles/Dockerfile.ledger
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate


# Build the ledger service
RUN npm run build ledger
Expand All @@ -34,8 +36,4 @@ COPY --from=build /app/libs/ ./libs/
COPY --from=build /app/node_modules ./node_modules

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/ledger/main.js"]

# docker build -t ledger -f Dockerfiles/Dockerfile.ledger .
# docker run -d --env-file .env --name ledger docker.io/library/ledger
# docker logs -f ledger
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/ledger/main.js"]
10 changes: 4 additions & 6 deletions Dockerfiles/Dockerfile.notification
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ RUN pnpm i --ignore-scripts

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate


# Build the notification service
RUN npm run build notification
Expand All @@ -34,8 +36,4 @@ COPY --from=build /app/libs/ ./libs/
COPY --from=build /app/node_modules ./node_modules

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/notification/main.js"]

# docker build -t notification -f Dockerfiles/Dockerfile.notification .
# docker run -d --env-file .env --name notification docker.io/library/notification
# docker logs -f notification
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/notification/main.js"]
10 changes: 4 additions & 6 deletions Dockerfiles/Dockerfile.organization
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate


# Build the organization service
RUN pnpm run build organization
Expand All @@ -33,8 +35,4 @@ COPY --from=build /app/libs/ ./libs/
COPY --from=build /app/node_modules ./node_modules

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/organization/main.js"]

# docker build -t organization -f Dockerfiles/Dockerfile.organization .
# docker run -d --env-file .env --name issuance docker.io/library/organization
# docker logs -f organization
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/organization/main.js"]
9 changes: 3 additions & 6 deletions Dockerfiles/Dockerfile.user
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ RUN pnpm install

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate

# Build the user service
RUN pnpm run build user
Expand Down Expand Up @@ -62,8 +63,4 @@ COPY --from=build /app/node_modules ./node_modules


# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && npx prisma && cd ../.. && node dist/apps/user/main.js"]

# docker build -t user -f Dockerfiles/Dockerfile.user .
# docker run -d --env-file .env --name user docker.io/library/user
# docker logs -f user
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/user/main.js"]
38 changes: 7 additions & 31 deletions Dockerfiles/Dockerfile.utility
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,8 @@
FROM node:18-slim as build
RUN npm install -g pnpm

# We don't need the standalone Chromium
ENV PUPPETEER_SKIP_CHROMIUM_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 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
RUN apt-get update -y
RUN apt-get --no-install-recommends install -y openssl
# Set the working directory
WORKDIR /app

Expand All @@ -26,26 +15,17 @@ RUN pnpm install

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate

# Build the user service
RUN pnpm run build utility

# Stage 2: Create the final image
FROM node:18-slim

# We don't need the standalone Chromium
ENV PUPPETEER_SKIP_CHROMIUM_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 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 apt-get update -y
RUN apt-get --no-install-recommends install -y openssl
# Set the working directory
WORKDIR /app
RUN npm install -g pnpm
Expand All @@ -60,8 +40,4 @@ COPY --from=build /app/node_modules ./node_modules


# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && npx prisma && cd ../.. && node dist/apps/utility/main.js"]

# docker build -t user -f Dockerfiles/Dockerfile.user .
# docker run -d --env-file .env --name user docker.io/library/user
# docker logs -f user
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/utility/main.js"]
9 changes: 3 additions & 6 deletions Dockerfiles/Dockerfile.verification
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate

# Build the user service
RUN npm run build verification
Expand All @@ -32,8 +33,4 @@ COPY --from=build /app/libs/ ./libs/
COPY --from=build /app/node_modules ./node_modules

# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/verification/main.js"]

# docker build -t verification -f Dockerfiles/Dockerfile.verification .
# docker run -d --env-file .env --name verification docker.io/library/verification
# docker logs -f verification
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/verification/main.js"]
9 changes: 3 additions & 6 deletions Dockerfiles/Dockerfile.webhook
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN pnpm i

# Copy the rest of the application code
COPY . .
RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
# RUN cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate
RUN cd libs/prisma-service && npx prisma migrate && npx prisma generate

# Build the webhook service
RUN pnpm run build webhook
Expand All @@ -35,8 +36,4 @@ COPY --from=build /app/node_modules ./node_modules


# Set the command to run the microservice
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && npx prisma generate && cd ../.. && node dist/apps/webhook/main.js"]

# docker build -t webhook -f Dockerfiles/Dockerfile.webhook .
# docker run -d --env-file .env --name webhook docker.io/library/webhook
# docker logs -f webhook
CMD ["sh", "-c", "cd libs/prisma-service && npx prisma migrate deploy && cd ../.. && node dist/apps/webhook/main.js"]
Loading

0 comments on commit 2146b9a

Please sign in to comment.