Skip to content
Snippets Groups Projects
Verified Commit 8dadb5fe authored by Konstantin Tsabolov's avatar Konstantin Tsabolov
Browse files

chore: fix dockerfile and package to support patches

parent f87d47ca
No related branches found
No related tags found
1 merge request!40End to end run preparation
Hide whitespace changes
Inline Side-by-side
Dockerfile
+ 4
− 0
View file @ 8dadb5fe
......@@ -12,6 +12,7 @@ RUN corepack enable
FROM base AS dependencies
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml tsconfig*.json .swcrc ./
COPY patches ./patches
COPY apps/shared/package.json ./apps/shared/
COPY devtools/package.json ./devtools/
RUN pnpm install --frozen-lockfile
......@@ -23,6 +24,7 @@ COPY apps/shared ./apps/shared
COPY --from=dependencies ${APP_HOME}/package.json ${APP_HOME}/pnpm-lock.yaml ${APP_HOME}/pnpm-workspace.yaml ${APP_HOME}/tsconfig*.json ${APP_HOME}/.swcrc ./
COPY --from=dependencies ${APP_HOME}/node_modules ./node_modules
COPY --from=dependencies ${APP_HOME}/apps/shared/node_modules ./apps/shared/node_modules
COPY --from=dependencies ${APP_HOME}/patches ./patches
RUN pnpm --filter shared build
# Build DevTools
......@@ -31,6 +33,7 @@ FROM base AS build-devtools
COPY --from=dependencies ${APP_HOME}/package.json ${APP_HOME}/pnpm-lock.yaml ${APP_HOME}/pnpm-workspace.yaml ${APP_HOME}/tsconfig*.json ${APP_HOME}/.swcrc ./
COPY --from=dependencies ${APP_HOME}/node_modules ./node_modules
COPY --from=dependencies ${APP_HOME}/devtools/node_modules ./devtools/node_modules
COPY --from=dependencies ${APP_HOME}/patches ./patches
COPY --from=build-shared ${APP_HOME}/apps/shared ./apps/shared
COPY devtools ./devtools
RUN pnpm --filter devtools build && pnpm --filter devtools --prod deploy build
......@@ -56,6 +59,7 @@ FROM base AS build-service
COPY --from=dependencies ${APP_HOME}/package.json ${APP_HOME}/pnpm-lock.yaml ${APP_HOME}/pnpm-workspace.yaml ${APP_HOME}/tsconfig*.json ${APP_HOME}/.swcrc ./
COPY --from=dependencies ${APP_HOME}/node_modules ./node_modules
COPY --from=dependencies ${APP_HOME}/patches ./patches
COPY --from=build-shared ${APP_HOME}/apps/shared ./apps/shared
COPY apps/${SERVICE} ./apps/${SERVICE}
RUN pnpm install --frozen-lockfile && pnpm --filter ${SERVICE} build && pnpm --filter ${SERVICE} --prod deploy build
......
package.json
+ 6
− 0
View file @ 8dadb5fe
......@@ -37,5 +37,11 @@
"husky": "9.0.11",
"lint-staged": "15.2.2",
"prettier": "3.2.5"
},
"pnpm": {
"patchedDependencies": {
"@credo-ts/indy-vdr@0.5.0-alpha.138": "patches/@credo-ts__indy-vdr@0.5.0-alpha.138.patch",
"@credo-ts/anoncreds@0.5.0-alpha.138": "patches/@credo-ts__anoncreds@0.5.0-alpha.138.patch"
}
}
}
pnpm-lock.yaml
+ 22
− 95
View file @ 8dadb5fe
......@@ -4,6 +4,14 @@ settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
 
patchedDependencies:
'@credo-ts/anoncreds@0.5.0-alpha.138':
hash: j426fc3a5cnwxikpued4ld6mqi
path: patches/@credo-ts__anoncreds@0.5.0-alpha.138.patch
'@credo-ts/indy-vdr@0.5.0-alpha.138':
hash: rx3uz4zmmaugcgt7ujdip54kgy
path: patches/@credo-ts__indy-vdr@0.5.0-alpha.138.patch
importers:
 
.:
......@@ -318,88 +326,6 @@ importers:
specifier: 5.3.3
version: 5.3.3
 
apps/did-manager:
dependencies:
'@nestjs/common':
specifier: ^10.3.0
version: 10.3.0(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nestjs/config':
specifier: ^3.1.1
version: 3.1.1(@nestjs/common@10.3.0)(reflect-metadata@0.1.14)
'@nestjs/core':
specifier: ^10.3.0
version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/microservices@10.3.0)(@nestjs/platform-express@10.3.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nestjs/microservices':
specifier: ^10.3.0
version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(nats@2.19.0)(reflect-metadata@0.1.14)(rxjs@7.8.1)
'@nestjs/platform-express':
specifier: ^10.3.0
version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)
'@nestjs/swagger':
specifier: ^7.2.0
version: 7.2.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.1.14)
'@ocm/shared':
specifier: workspace:*
version: link:../shared
class-transformer:
specifier: ^0.5.1
version: 0.5.1
class-validator:
specifier: ^0.14.0
version: 0.14.1
express:
specifier: ^4.17.3
version: 4.18.2
joi:
specifier: ^17.11.0
version: 17.11.1
nats:
specifier: ^2.18.0
version: 2.19.0
reflect-metadata:
specifier: ^0.1.13
version: 0.1.14
rxjs:
specifier: ^7.8.1
version: 7.8.1
devDependencies:
'@nestjs/cli':
specifier: ^10.3.0
version: 10.3.0(@swc/cli@0.1.63)(@swc/core@1.3.103)
'@nestjs/schematics':
specifier: ^10.1.0
version: 10.1.0(chokidar@3.5.3)(typescript@5.3.3)
'@nestjs/testing':
specifier: ^10.3.0
version: 10.3.0(@nestjs/common@10.3.0)(@nestjs/core@10.3.0)(@nestjs/microservices@10.3.0)(@nestjs/platform-express@10.3.0)
'@swc/cli':
specifier: ^0.1.62
version: 0.1.63(@swc/core@1.3.103)
'@swc/core':
specifier: ^1.3.96
version: 1.3.103
'@swc/jest':
specifier: ^0.2.29
version: 0.2.29(@swc/core@1.3.103)
'@types/express':
specifier: ^4.17.21
version: 4.17.21
'@types/jest':
specifier: ^29.5.8
version: 29.5.11
'@types/node':
specifier: ^20.9.0
version: 20.11.5
jest:
specifier: ^29.7.0
version: 29.7.0(@types/node@20.11.5)(ts-node@10.9.2)
rimraf:
specifier: ^5.0.5
version: 5.0.5
typescript:
specifier: ^5.3.2
version: 5.3.3
apps/proof-manager:
dependencies:
'@nestjs/common':
......@@ -595,7 +521,7 @@ importers:
dependencies:
'@credo-ts/anoncreds':
specifier: 0.5.0-alpha.138
version: 0.5.0-alpha.138(@hyperledger/anoncreds-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
version: 0.5.0-alpha.138(patch_hash=j426fc3a5cnwxikpued4ld6mqi)(@hyperledger/anoncreds-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
'@credo-ts/core':
specifier: 0.5.0-alpha.138
version: 0.5.0-alpha.138(expo@49.0.21)(react-native@0.73.2)
......@@ -686,7 +612,7 @@ importers:
dependencies:
'@credo-ts/anoncreds':
specifier: 0.5.0-alpha.138
version: 0.5.0-alpha.138(@hyperledger/anoncreds-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
version: 0.5.0-alpha.138(patch_hash=j426fc3a5cnwxikpued4ld6mqi)(@hyperledger/anoncreds-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
'@credo-ts/askar':
specifier: 0.5.0-alpha.138
version: 0.5.0-alpha.138(@hyperledger/aries-askar-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
......@@ -695,7 +621,7 @@ importers:
version: 0.5.0-alpha.138(expo@49.0.21)(react-native@0.73.2)
'@credo-ts/indy-vdr':
specifier: 0.5.0-alpha.138
version: 0.5.0-alpha.138(@hyperledger/anoncreds-shared@0.2.0)(@hyperledger/indy-vdr-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
version: 0.5.0-alpha.138(patch_hash=rx3uz4zmmaugcgt7ujdip54kgy)(@hyperledger/anoncreds-shared@0.2.0)(@hyperledger/indy-vdr-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
'@credo-ts/node':
specifier: 0.5.0-alpha.138
version: 0.5.0-alpha.138(expo@49.0.21)(react-native@0.73.2)
......@@ -2679,7 +2605,7 @@ packages:
chalk: 4.1.2
dev: true
 
/@credo-ts/anoncreds@0.5.0-alpha.138(@hyperledger/anoncreds-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2):
/@credo-ts/anoncreds@0.5.0-alpha.138(patch_hash=j426fc3a5cnwxikpued4ld6mqi)(@hyperledger/anoncreds-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2):
resolution: {integrity: sha512-AJLQXquMO2g/3w9YvC1/NtU963HWC1y5Ikp8pgGntKhpGTKcwBAbtG6BM7PynWsExYd/DOjNsy0BM5H9gtVTAw==}
peerDependencies:
'@hyperledger/anoncreds-shared': ^0.2.0
......@@ -2698,6 +2624,7 @@ packages:
- supports-color
- web-streams-polyfill
dev: false
patched: true
 
/@credo-ts/askar@0.5.0-alpha.138(@hyperledger/aries-askar-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2):
resolution: {integrity: sha512-rD5u9/eIZhkoNpDQM/6N6PYn5mEt83t90DEtB+arTSE1LJ3FZIakZeI3G/ilDLTo2Pzkk8Xq2Zk1Kfh1uqyBMg==}
......@@ -2763,12 +2690,12 @@ packages:
- web-streams-polyfill
dev: false
 
/@credo-ts/indy-vdr@0.5.0-alpha.138(@hyperledger/anoncreds-shared@0.2.0)(@hyperledger/indy-vdr-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2):
/@credo-ts/indy-vdr@0.5.0-alpha.138(patch_hash=rx3uz4zmmaugcgt7ujdip54kgy)(@hyperledger/anoncreds-shared@0.2.0)(@hyperledger/indy-vdr-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2):
resolution: {integrity: sha512-1opj8vL95xctnD4oI+apZNwG+8SUJAF/2nFXrT0ifk99Mb7H2ZYgcG/P0JUIx/R9Vuu76mJIdI6Rz//x1siuXg==}
peerDependencies:
'@hyperledger/indy-vdr-shared': ^0.2.0
dependencies:
'@credo-ts/anoncreds': 0.5.0-alpha.138(@hyperledger/anoncreds-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
'@credo-ts/anoncreds': 0.5.0-alpha.138(patch_hash=j426fc3a5cnwxikpued4ld6mqi)(@hyperledger/anoncreds-shared@0.2.0)(expo@49.0.21)(react-native@0.73.2)
'@credo-ts/core': 0.5.0-alpha.138(expo@49.0.21)(react-native@0.73.2)
'@hyperledger/indy-vdr-shared': 0.2.0
transitivePeerDependencies:
......@@ -2780,6 +2707,7 @@ packages:
- supports-color
- web-streams-polyfill
dev: false
patched: true
 
/@credo-ts/node@0.5.0-alpha.138(expo@49.0.21)(react-native@0.73.2):
resolution: {integrity: sha512-e3y10v0ROKe2/sKMbEIDIr1StnvQ9eMcxPPdNDAAgjzLIK9mr0ieV42dt7EKaQc0iRLDpcmxETUHgkxgllaYvw==}
......@@ -3371,7 +3299,7 @@ packages:
require-from-string: 2.0.2
requireg: 0.2.2
resolve-from: 5.0.0
semver: 7.5.4
semver: 7.6.0
send: 0.18.0
slugify: 1.6.6
structured-headers: 0.4.1
......@@ -3414,7 +3342,7 @@ packages:
getenv: 1.0.0
glob: 7.1.6
resolve-from: 5.0.0
semver: 7.5.4
semver: 7.6.0
slash: 3.0.0
xcode: 3.0.1
xml2js: 0.6.0
......@@ -4532,7 +4460,7 @@ packages:
resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
dependencies:
'@gar/promisify': 1.1.3
semver: 7.5.4
semver: 7.6.0
dev: false
optional: true
 
......@@ -4644,7 +4572,7 @@ packages:
ip: 1.1.8
node-stream-zip: 1.15.0
ora: 5.4.1
semver: 7.5.4
semver: 7.6.0
strip-ansi: 5.2.0
wcwidth: 1.0.1
yaml: 2.3.4
......@@ -4729,7 +4657,7 @@ packages:
node-fetch: 2.7.0
open: 6.4.0
ora: 5.4.1
semver: 7.5.4
semver: 7.6.0
shell-quote: 1.8.1
sudo-prompt: 9.2.1
transitivePeerDependencies:
......@@ -4766,7 +4694,7 @@ packages:
fs-extra: 8.1.0
graceful-fs: 4.2.11
prompts: 2.4.2
semver: 7.5.4
semver: 7.6.0
transitivePeerDependencies:
- bufferutil
- encoding
......@@ -13603,7 +13531,6 @@ packages:
hasBin: true
dependencies:
lru-cache: 6.0.0
dev: true
 
/send@0.18.0:
resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent