cms/cms/Dockerfile

@@ -31,7 +31,7 @@ RUN addgroup -g 1001 -S nodejs && \
 
 # Copy built application from builder stage
 COPY --from=builder --chown=nodejs:nodejs /app/dist ./dist
-COPY --from=builder --chown=nodejs:nodejs /app/dist/config ./config
+COPY --from=builder --chown=nodejs:nodejs /app/config ./config
 COPY --from=builder --chown=nodejs:nodejs /app/public ./public
 COPY --from=builder --chown=nodejs:nodejs /app/favicon.png ./favicon.png
 COPY --from=builder --chown=nodejs:nodejs /app/node_modules ./node_modules

cms/cms/config/database.ts

@@ -11,13 +11,15 @@ export default ({ env }) => {
   if (client === 'postgres') {
     return {
       connection: {
-        client: 'postgres',
+        client,
-        host: env('DATABASE_HOST', 'localhost'),
+        connection: {
-        port: env.int('DATABASE_PORT', 5432),
+          host: env('DATABASE_HOST', 'localhost'),
-        database: env('DATABASE_NAME', 'strapi'),
+          port: env.int('DATABASE_PORT', 5432),
-        user: env('DATABASE_USERNAME', 'strapi'),
+          database: env('DATABASE_NAME', 'strapi'),
-        password: env('DATABASE_PASSWORD', 'strapi'),
+          user: env('DATABASE_USERNAME', 'strapi'),
-        ssl: env.bool('DATABASE_SSL', false),
+          password: env('DATABASE_PASSWORD', 'strapi'),
+          ssl: env.bool('DATABASE_SSL', false),
+        },
         pool: { min: 2, max: 10 },
       },
     };
@@ -25,8 +27,10 @@ export default ({ env }) => {
 
   return {
     connection: {
-      client: 'sqlite',
+      client,
-      filename: path.join(__dirname, '..', '..', env('DATABASE_FILENAME', '.tmp/data.db')),
+      connection: {
+        filename: path.join(__dirname, '..', '..', env('DATABASE_FILENAME', '.tmp/data.db')),
+      },
       useNullAsDefault: true,
     },
   };