Shahed Nasser 3 роки тому
батько
коміт
230a430dc5
3 змінених файлів з 26 додано та 14 видалено
  1. 14 5
      .do/deploy.template.yaml
  2. 11 8
      medusa-config.js
  3. 1 1
      package.json

+ 14 - 5
.do/deploy.template.yaml

@@ -4,12 +4,21 @@ spec:
     - name: medusa-server
       git:
         branch: main
-        repo_clone_url: https://github.com/medusajs/medusa-starter-default
-        branch: feat/deploy-digitalocean
+        repo_clone_url: https://github.com/medusajs/medusa-starter-default.git
+        branch: feat-deploy-digitalocean
     envs:
-    - key: DATABASE_URL
-      scope: RUN_TIME
-      value: ${db.DATABASE_URL}
+    - key: DB_USERNAME
+      value: ${db.USERNAME}
+    - key: DB_PASSWORD
+      value: ${db.PASSWORD}
+    - key: DB_HOST
+      value: ${db.HOSTNAME}
+    - key: DB_PORT
+      value: ${db.PORT}
+    - key: DB_PORT
+      value: ${db.PORT}
+    - key: DB_DATABASE
+      value: ${db.DATABASE}
     - key: REDIS_URL
       value: ${redis-db.DATABASE_URL}
     - key: JWT_SECRET

+ 11 - 8
medusa-config.js

@@ -28,9 +28,13 @@ const ADMIN_CORS = process.env.ADMIN_CORS || "http://localhost:7000,http://local
 // CORS to avoid issues when consuming Medusa from a client
 const STORE_CORS = process.env.STORE_CORS || "http://localhost:8000";
 
-// Database URL (here we use a local database called medusa-development)
-const DATABASE_URL =
-  process.env.DATABASE_URL || "postgres://localhost/medusa-store";
+const DB_USERNAME = process.env.DB_USERNAME;
+const DB_PASSWORD = process.env.DB_PASSWORD;
+const DB_HOST = process.env.DB_HOST;
+const DB_PORT = process.env.DB_PORT;
+const DB_DATABASE = process.env.DB_DATABASE;
+
+const DATABASE_URL = `postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_DATABASE}`;
 
 // Medusa uses Redis, so this needs configuration as well
 const REDIS_URL = process.env.REDIS_URL || "redis://localhost:6379";
@@ -56,14 +60,13 @@ const plugins = [
 
 module.exports = {
   projectConfig: {
-    // redis_url: REDIS_URL,
+    redis_url: REDIS_URL,
     // For more production-like environment install PostgresQL
-    // database_url: DATABASE_URL,
-    // database_type: "postgres",
-    database_database: "./medusa-db.sql",
-    database_type: "sqlite",
+    database_url: DATABASE_URL,
+    database_type: "postgres",
     store_cors: STORE_CORS,
     admin_cors: ADMIN_CORS,
+    database_extra: { ssl: { rejectUnauthorized: false } }
   },
   plugins,
 };

+ 1 - 1
package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "seed": "medusa seed -f ./data/seed.json",
     "build": "babel src -d dist --extensions \".ts,.js\"",
-    "start": "medusa develop"
+    "start": "medusa migrations run && medusa develop"
   },
   "dependencies": {
     "@medusajs/medusa": "^1.3.4",