Merge branch 'chore/change-registry' into develop

Medici-Mansion · Dec 16, 2023 · 84fcc41 · 84fcc41
2 parents 38b0272 + 75fde54
commit 84fcc41
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 46 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20-slim AS base
+FROM node:20 AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable

diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
@@ -22,51 +22,51 @@ spec:
               cpu: '500m'
           ports:
             - containerPort: 3000
-          envFrom:
-            - secretRef:
-                name: catsnewyear-prod
-          # env:
-          # - name: NODE_ENV
-          #   valueFrom:
-          #     secretKeyRef:
+          # envFrom:
+          #   - secretRef:
           #       name: catsnewyear-prod
-          #       key: NODE_ENV
-          #       optional: false
-          # - name: PORT
-          #   valueFrom:
-          #     secretKeyRef:
-          #       name: catsnewyear-prod
-          #       key: PORT
-          #       optional: false
-          # - name: DB_HOST
-          #   valueFrom:
-          #     secretKeyRef:
-          #       name: catsnewyear-prod
-          #       key: DB_HOST
-          #       optional: false
-          # - name: DB_PORT
-          #   valueFrom:
-          #     secretKeyRef:
-          #       name: catsnewyear-prod
-          #       key: DB_PORT
-          #       optional: false
-          # - name: DB_USER
-          #   valueFrom:
-          #     secretKeyRef:
-          #       name: catsnewyear-prod
-          #       key: DB_USER
-          #       optional: false
-          # - name: DB_PWD
-          #   valueFrom:
-          #     secretKeyRef:
-          #       name: catsnewyear-prod
-          #       key: DB_PWD
-          #       optional: false
-          # - name: DB_NAME
-          #   valueFrom:
-          #     secretKeyRef:
-          #       name: catsnewyear-prod
-          #       key: DB_NAME
-          #       optional: false
+          env:
+            - name: NODE_ENV
+              valueFrom:
+                secretKeyRef:
+                  name: catsnewyear-prod
+                  key: NODE_ENV
+                  optional: false
+            - name: PORT
+              valueFrom:
+                secretKeyRef:
+                  name: catsnewyear-prod
+                  key: PORT
+                  optional: false
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: catsnewyear-prod
+                  key: DB_HOST
+                  optional: false
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: catsnewyear-prod
+                  key: DB_PORT
+                  optional: false
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: catsnewyear-prod
+                  key: DB_USER
+                  optional: false
+            - name: DB_PWD
+              valueFrom:
+                secretKeyRef:
+                  name: catsnewyear-prod
+                  key: DB_PWD
+                  optional: false
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: catsnewyear-prod
+                  key: DB_NAME
+                  optional: false
       imagePullSecrets:
         - name: vultr-registry