From d38e6095f9b71467b8486430fba4bb7007ec4c5a Mon Sep 17 00:00:00 2001 From: Louistiti Date: Thu, 6 Jun 2019 09:06:48 +0800 Subject: [PATCH] fix: take `.env` in consideration when using Docker --- .dockerignore | 1 - Dockerfile | 1 + scripts/setup/setup-dotenv.js | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index e84b9042..d3efc418 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ node_modules/ bridges/python/.venv/* -.env !bridges/python/.venv/.gitkeep diff --git a/Dockerfile b/Dockerfile index 0d753ae7..c0944be3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM node:10-alpine +ENV IS_DOCKER true WORKDIR /app # Install system packages diff --git a/scripts/setup/setup-dotenv.js b/scripts/setup/setup-dotenv.js index 4e9c4db4..6fd08cc6 100644 --- a/scripts/setup/setup-dotenv.js +++ b/scripts/setup/setup-dotenv.js @@ -19,6 +19,8 @@ export default () => new Promise(async (resolve) => { if (!fs.existsSync('.env')) { createDotenv() + resolve() + } else if (process.env.IS_DOCKER === 'true') { resolve() } else { const answer = await prompt({