radixdlt · AbstractFruitFactory · Jan 3, 2025 · Dec 23, 2024 · Jan 3, 2025
diff --git 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/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
+    path: /metrics
+
+enable_db_migrations: true
diff --git 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
@@ -35,3 +35,5 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
+
+dbSeed: true
diff --git a/deploy/helm/environments/demo/dapp.yaml.gotmpl b/deploy/helm/environments/demo/dapp.yaml.gotmpl
@@ -38,3 +38,4 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
+
diff --git 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
diff --git a/deploy/helm/environments/pr/dapp.yaml.gotmpl b/deploy/helm/environments/pr/dapp.yaml.gotmpl
@@ -23,3 +23,4 @@ ingress:
       paths:
         - path: /
           pathType: ImplementationSpecific
+
diff --git 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
@@ -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
@@ -57,7 +57,7 @@
     "apps/*",
     "packages/*"
   ],
-  "prisma":{
+  "prisma": {
     "seed": "tsx packages/database/prisma/seed.ts"
   }
-}
+}
diff --git 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"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -357,4 +357,3 @@ jobs:
		secrets:
		aws_deployment_account_id: ${{ secrets.AWS_DEV_ACCOUNT_ID }}
		secrets_account_id: ${{ secrets.SECRETS_ACCOUNT_ID }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,3 +35,5 @@ ingress: @@
           paths:
             - path: /
               pathType: ImplementationSpecific
+    dbSeed: true
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,4 @@ ingress:
		paths:
		- path: /
		pathType: ImplementationSpecific
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,3 +23,4 @@ ingress:
		paths:
		- path: /
		pathType: ImplementationSpecific