configmaps - secrets

RekhaKalyan · Sep 20, 2023 · a5d7a68 · a5d7a68
1 parent 1383e26
commit a5d7a68
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 28 deletions.
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -10,6 +10,6 @@ COPY . .
 RUN npx prisma generate
 RUN npm run build
 # Expose port
-EXPOSE 8080
+EXPOSE 3000
 # Start app
 CMD [ "npm", "start" ]
diff --git a/api/package.json b/api/package.json
@@ -6,7 +6,7 @@
   "private": "true",
   "scripts": {
     "lint": "eslint src/",
-    "start": "prisma migrate deploy && node build/index.js",
+    "start": "node build/index.js",
     "build": "tsc",
     "dev": "ts-node-dev --respawn --pretty --transpile-only --exit-child src/index.ts",
     "test": "echo \"Error: no test specified\"",

diff --git a/api/src/app.ts b/api/src/app.ts
@@ -20,8 +20,8 @@ app.use(cors());
 app.use(express.json());
 
 // Routers
-app.use("/api", healthchecksRouter);
-app.use("/api/courses", coursesRouter);
+app.use("/", healthchecksRouter);
+app.use("/courses", coursesRouter);
 
 // Error and 404
 app.use(errorHandler);

diff --git a/api/src/index.ts b/api/src/index.ts
@@ -1,5 +1,7 @@
 import app from "./app";
 import { getConfig } from "./common/config";
+import { execSync } from "child_process";
+import path from "path";
 
 if (!getConfig("PORT")) {
   process.exit(1);
@@ -8,6 +10,27 @@ if (!getConfig("PORT")) {
 const PORT: number = parseInt(getConfig("PORT") as string, 10);
 
 async function main() {
+  // Build the database connection string
+  console.log("Building database connection string");
+  const dbHost = getConfig("DB_HOST") || "localhost";
+  const dbPort = getConfig("DB_PORT") || 5432;
+  const dbName = getConfig("DB_NAME") || "postgres";
+  const dbUser = getConfig("DB_USER") || "postgres";
+  const dbPassword = getConfig("DB_PASSWORD") || "password";
+  const dbConnectionString = `postgres://${dbUser}:${dbPassword}@${dbHost}:${dbPort}/${dbName}`;
+  // Set DATABASE_URL environment variable
+  process.env.DATABASE_URL = dbConnectionString;
+
+  // Run prisma migrations
+  console.log("Migrating database...");
+  execSync(
+    `export DATABASE_URL=${dbConnectionString} && npx prisma migrate deploy --schema ${path.join(
+      __dirname,
+      "../prisma/schema.prisma"
+    )}`,
+    { stdio: "inherit" }
+  );
+
   // Start the server
   app.listen(PORT, () => {
     console.log(`🚀 App started in ${getConfig("MODE")} mode on port ${PORT}.`);

diff --git a/webapp/.env b/webapp/.env
@@ -1 +1 @@
-VITE_API_URL=http://localhost:8080/api
+VITE_API_URL=http://localhost:8080
diff --git a/webapp/index.html b/webapp/index.html
@@ -1,22 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-  <meta charset="UTF-8" />
-  <link rel="icon" href="/dl-logo.png" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Digital Lync LMS</title>
-  <style>
-    body {
-      color: 'white';
-      background-color: red;
-    }
-  </style>
-</head>
-
-<body>
-  <div id="root"></div>
-  <script type="module" src="/src/main.tsx"></script>
-</body>
-
-</html>
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" href="/dl-logo.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Digital Lync LMS</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
diff --git a/webapp/nginx.conf b/webapp/nginx.conf
@@ -1,8 +1,6 @@
 server {
     listen       80;
-    listen      3000;
     listen  [::]:80;
-    listen  [::]:3000;
     server_name  localhost;
 
     #access_log  /var/log/nginx/host.access.log  main;

diff --git a/webapp/package.json b/webapp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "webapp",
   "private": true,
-  "version": "2.1",
+  "version": "0.0.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		VITE_API_URL=http://localhost:8080/api
		VITE_API_URL=http://localhost:8080