merged the main api to also utilise postgres

TUM-Dev · Nov 12, 2023 · 32c6a98 · 32c6a98
1 parent 92682d3
commit 32c6a98
Show file tree

Hide file tree

Showing 45 changed files with 215 additions and 286 deletions.
diff --git a/deployment/k3s/templates/deployments/server-deployment.yaml b/deployment/k3s/templates/deployments/server-deployment.yaml
@@ -42,8 +42,18 @@ spec:
                 name: server-api-keys # MEILI_MASTER_KEY
           {{ end }}
           env:
-            - name: DB_LOCATION
-              value: api_data.db
+            - name: POSTGRES_URL
+              value: postgres-rw.navigatum.svc.cluster.local
+            - name: POSTGRES_USER
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-db-secret
+                  key: user
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-db-secret
+                  key: password
           ports:
             - containerPort: 3003
               name: api

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -79,6 +79,10 @@ services:
     user: 1000:3000
     environment:
       MIELI_URL: http://meilisearch:7700
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_URL: db:5432
     depends_on:
       meilisearch:
         condition: service_healthy

diff --git a/server/.sqlx/query-1883c95212e7119034b648e74c6a5f5c40a99660e0413e0a26853ecb5c21462e.json b/server/.sqlx/query-1883c95212e7119034b648e74c6a5f5c40a99660e0413e0a26853ecb5c21462e.json
diff --git a/server/.sqlx/query-3de656b156e0d049f115ec5260f84af18f85a63d62f7d7497359d8e5fc2d4078.json b/server/.sqlx/query-3de656b156e0d049f115ec5260f84af18f85a63d62f7d7497359d8e5fc2d4078.json
diff --git a/server/.sqlx/query-5d4abea3319fe17022f23ee48f7b0be2fec596fdc768167a81082d0b5966fce4.json b/server/.sqlx/query-5d4abea3319fe17022f23ee48f7b0be2fec596fdc768167a81082d0b5966fce4.json
diff --git a/server/.sqlx/query-644bce09e28dd856187ca56660f7eea452d645c26f2d3c44460e669a835ca815.json b/server/.sqlx/query-644bce09e28dd856187ca56660f7eea452d645c26f2d3c44460e669a835ca815.json
diff --git a/server/.sqlx/query-866f41f41ff9e68e92736009d98b37f497aeb87f11eeafa13eadd4fefda706b5.json b/server/.sqlx/query-866f41f41ff9e68e92736009d98b37f497aeb87f11eeafa13eadd4fefda706b5.json
diff --git a/...c4222a914ce2d09a112c4dda259c425b3587.json → ...d161757d7ce6fcee59c23c23abbf45e803cb.json b/...c4222a914ce2d09a112c4dda259c425b3587.json → ...d161757d7ce6fcee59c23c23abbf45e803cb.json
diff --git a/...722d58068d3187a54cdf95dd8361db2d4c26.json → ...a8d4ec920f8b46eaeaa37205c307b27b7332.json b/...722d58068d3187a54cdf95dd8361db2d4c26.json → ...a8d4ec920f8b46eaeaa37205c307b27b7332.json
diff --git a/...539734b181798e2dba867f40bc460c7b9a3a.json → ...de7a221ce7d9bb8378028c695e1b665c55c5.json b/...539734b181798e2dba867f40bc460c7b9a3a.json → ...de7a221ce7d9bb8378028c695e1b665c55c5.json
diff --git a/...7097d4186c3eb97649a45abc378fc8a2a83b.json → ...9b32f08c86626db9f4d63249dfc2cd77b80c.json b/...7097d4186c3eb97649a45abc378fc8a2a83b.json → ...9b32f08c86626db9f4d63249dfc2cd77b80c.json
diff --git a/...dc195d4716f7857a99494918905ee5bfb868.json → ...1a495534817fb39a9e25f6720267c6025965.json b/...dc195d4716f7857a99494918905ee5bfb868.json → ...1a495534817fb39a9e25f6720267c6025965.json
diff --git a/server/.sqlx/query-b59dbe8a5c3b6f7fdb9543508ae7b1473d24ffea9d69a8a96ca7bedf6aa2c6e4.json b/server/.sqlx/query-b59dbe8a5c3b6f7fdb9543508ae7b1473d24ffea9d69a8a96ca7bedf6aa2c6e4.json
diff --git a/server/.sqlx/query-b689ec21c7bcb38c8853d5146852d5a84a0774d47e1957da8eac576bedcfebcc.json b/server/.sqlx/query-b689ec21c7bcb38c8853d5146852d5a84a0774d47e1957da8eac576bedcfebcc.json
diff --git a/server/.sqlx/query-b85ef040a74d51bf6b539703028583c9a0917f5203ccdc4ed01e4272fb68d1d8.json b/server/.sqlx/query-b85ef040a74d51bf6b539703028583c9a0917f5203ccdc4ed01e4272fb68d1d8.json