From 40503bafce27fefef7aee2c44ba387723eb0d8a6 Mon Sep 17 00:00:00 2001 From: Duje Begonja Date: Mon, 23 Dec 2024 14:06:13 +0100 Subject: [PATCH 1/2] fix(dapp): db seed command --- .github/workflows/ci.yaml | 1 - deploy/helm/environments/demo/dapp.yaml.gotmpl | 2 ++ deploy/helm/environments/pr/dapp.yaml.gotmpl | 2 ++ deploy/helm/fullstack-chart/templates/deployment.yaml | 6 +++++- dockerfiles/dapp.Dockerfile | 4 ++++ package.json | 4 ++-- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 07600f4a2..e002c1f36 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -357,4 +357,3 @@ jobs: secrets: aws_deployment_account_id: ${{ secrets.AWS_DEV_ACCOUNT_ID }} secrets_account_id: ${{ secrets.SECRETS_ACCOUNT_ID }} - diff --git a/deploy/helm/environments/demo/dapp.yaml.gotmpl b/deploy/helm/environments/demo/dapp.yaml.gotmpl index 01ae6365f..82ca3146a 100644 --- a/deploy/helm/environments/demo/dapp.yaml.gotmpl +++ b/deploy/helm/environments/demo/dapp.yaml.gotmpl @@ -38,3 +38,5 @@ ingress: paths: - path: / pathType: ImplementationSpecific + +dbSeed: true \ No newline at end of file diff --git a/deploy/helm/environments/pr/dapp.yaml.gotmpl b/deploy/helm/environments/pr/dapp.yaml.gotmpl index fde6643b6..7221010f7 100644 --- a/deploy/helm/environments/pr/dapp.yaml.gotmpl +++ b/deploy/helm/environments/pr/dapp.yaml.gotmpl @@ -23,3 +23,5 @@ ingress: paths: - path: / pathType: ImplementationSpecific + +dbSeed: true \ No newline at end of file diff --git a/deploy/helm/fullstack-chart/templates/deployment.yaml b/deploy/helm/fullstack-chart/templates/deployment.yaml index b6cb29deb..bedcf3cf5 100644 --- a/deploy/helm/fullstack-chart/templates/deployment.yaml +++ b/deploy/helm/fullstack-chart/templates/deployment.yaml @@ -39,7 +39,11 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} command: ["/bin/sh", "-c", "-e"] args: + {{- if eq (default .Values.dbSeed false) true }} + - npx prisma migrate deploy --schema packages/database/prisma/schema.prisma && cd packages/database && npx prisma db seed + {{- else }} - npx prisma migrate deploy --schema packages/database/prisma/schema.prisma + {{- end }} env: {{- range $secret := .Values.secrets }} - name: {{ $secret.env_variable }} @@ -52,7 +56,7 @@ spec: - name: {{ $key }} value: {{ $value | quote }} {{- end }} - {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: diff --git a/dockerfiles/dapp.Dockerfile b/dockerfiles/dapp.Dockerfile index 6d8a94f5a..27155c76e 100644 --- a/dockerfiles/dapp.Dockerfile +++ b/dockerfiles/dapp.Dockerfile @@ -38,6 +38,10 @@ COPY --from=build /app/apps/ apps COPY --from=build /app/packages/ packages COPY --from=build /app/node_modules node_modules +COPY --from=build /app/packages/database/src/ . + +RUN npx prisma generate + RUN npm install pm2 -g && \ pm2 install pm2-metrics diff --git a/package.json b/package.json index 2d054bc9c..7818dc489 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "apps/*", "packages/*" ], - "prisma":{ + "prisma": { "seed": "tsx packages/database/prisma/seed.ts" } -} \ No newline at end of file +} From 7d8a92799b286b21674d2e519ad7b8374023a2c0 Mon Sep 17 00:00:00 2001 From: shambupujar Date: Fri, 3 Jan 2025 14:55:38 +0000 Subject: [PATCH 2/2] fix(dapp): make admin to run migration and dbseed --- deploy/helm/environments/common/admin.yaml.gotmpl | 4 +++- deploy/helm/environments/common/dapp.yaml.gotmpl | 2 +- deploy/helm/environments/demo/admin.yaml.gotmpl | 2 ++ deploy/helm/environments/demo/dapp.yaml.gotmpl | 1 - deploy/helm/environments/pr/admin.yaml.gotmpl | 2 ++ deploy/helm/environments/pr/dapp.yaml.gotmpl | 1 - packages/database/package.json | 3 ++- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/deploy/helm/environments/common/admin.yaml.gotmpl b/deploy/helm/environments/common/admin.yaml.gotmpl index 31d10f90d..27fd99765 100644 --- a/deploy/helm/environments/common/admin.yaml.gotmpl +++ b/deploy/helm/environments/common/admin.yaml.gotmpl @@ -34,4 +34,6 @@ serviceMonitors: - name: admin-pm2-metrics port: pm2-metrics interval: 30s - path: /metrics \ No newline at end of file + path: /metrics + +enable_db_migrations: true \ No newline at end of file diff --git a/deploy/helm/environments/common/dapp.yaml.gotmpl b/deploy/helm/environments/common/dapp.yaml.gotmpl index 181ab6fee..11402f976 100644 --- a/deploy/helm/environments/common/dapp.yaml.gotmpl +++ b/deploy/helm/environments/common/dapp.yaml.gotmpl @@ -9,7 +9,7 @@ image: repository: radixdlt/fullstack-dapp-example-dapp tag: {{ .StateValues.ci.tag }} -enable_db_migrations: true + service: port: 3000 diff --git a/deploy/helm/environments/demo/admin.yaml.gotmpl b/deploy/helm/environments/demo/admin.yaml.gotmpl index 9172d4e56..563a12b72 100644 --- a/deploy/helm/environments/demo/admin.yaml.gotmpl +++ b/deploy/helm/environments/demo/admin.yaml.gotmpl @@ -35,3 +35,5 @@ ingress: paths: - path: / pathType: ImplementationSpecific + +dbSeed: true \ No newline at end of file diff --git a/deploy/helm/environments/demo/dapp.yaml.gotmpl b/deploy/helm/environments/demo/dapp.yaml.gotmpl index 82ca3146a..c8131b041 100644 --- a/deploy/helm/environments/demo/dapp.yaml.gotmpl +++ b/deploy/helm/environments/demo/dapp.yaml.gotmpl @@ -39,4 +39,3 @@ ingress: - path: / pathType: ImplementationSpecific -dbSeed: true \ No newline at end of file diff --git a/deploy/helm/environments/pr/admin.yaml.gotmpl b/deploy/helm/environments/pr/admin.yaml.gotmpl index dff6044ac..925a10dd7 100644 --- a/deploy/helm/environments/pr/admin.yaml.gotmpl +++ b/deploy/helm/environments/pr/admin.yaml.gotmpl @@ -19,3 +19,5 @@ ingress: paths: - path: / pathType: ImplementationSpecific + +dbSeed: true \ No newline at end of file diff --git a/deploy/helm/environments/pr/dapp.yaml.gotmpl b/deploy/helm/environments/pr/dapp.yaml.gotmpl index 7221010f7..da1d60c8f 100644 --- a/deploy/helm/environments/pr/dapp.yaml.gotmpl +++ b/deploy/helm/environments/pr/dapp.yaml.gotmpl @@ -24,4 +24,3 @@ ingress: - path: / pathType: ImplementationSpecific -dbSeed: true \ No newline at end of file diff --git a/packages/database/package.json b/packages/database/package.json index 3099b97dc..d9fef1cbb 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -17,7 +17,8 @@ "@prisma/extension-read-replicas": "^0.4.0" }, "devDependencies": { - "prisma": "^5.15.0" + "prisma": "^5.15.0", + "tsx" : "^4.19.2" }, "prisma": { "seed": "tsx prisma/seed.ts"