env handling

Author: tbscu

.dockerignore

@@ -1,4 +1,3 @@
 node_modules
 .cache
 public/uploads
-.env

Dockerfile

@@ -1,6 +1,6 @@
 FROM strapi/base:14
 
-WORKDIR /my-path
+WORKDIR /app
 
 COPY ./package.json ./
 COPY ./yarn.lock ./

Dockerfile_dev

@@ -1,6 +1,6 @@
 FROM strapi/base:14
 
-WORKDIR /my-path
+WORKDIR /app
 
 COPY ./package.json ./
 COPY ./yarn.lock ./

config/database.js

@@ -4,7 +4,7 @@ module.exports = ({ env }) => ({
     default: {
       connector: 'bookshelf',
       settings: {
-        client: 'postgres',
+        client: env('DATABASE_CLIENT', 'postgres'),
         host: env('DATABASE_HOST', 'localhost'),
         port: env.int('DATABASE_PORT', 5432),
         database: env('DATABASE_NAME', 'strapi'),

docker-compose.yml

@@ -10,6 +10,8 @@ services:
       - web
     expose:
       - 1337
+    volumes:
+      - ../.env:/app/.env
 networks:
   intern:
       external: true

docker-compose_dev.yml

@@ -2,17 +2,18 @@ version: '3'
 services:
   strapi:
     build:
-      context: .
+      context: ./
       dockerfile: Dockerfile_dev
     command: yarn develop
-    env_file: .env
     external_links:
       - postgres13master
     networks:
       - intern
       - web
     ports:
       - '1337:1337'
+    volumes:
+      - ../.env:/app/.env
 networks:
   intern:
       external: true