Set DOCKER_ENV in docker-compose

ntutshop · Jan 6, 2019 · 86b3add · 86b3add
1 parent 7d1806a
commit 86b3add
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,6 @@ WORKDIR /app
 RUN yarn install
 RUN yarn build
 
-CMD [ "yarn", "docker" ]
+CMD [ "yarn", "start" ]
 
 EXPOSE 3000
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,6 +8,8 @@ services:
       - "3000"
     depends_on:
       - mariadb
+    environment:
+      DOCKER_ENV: "1"
   mariadb:
     container_name: mariadb
     image: mariadb

diff --git a/package.json b/package.json
@@ -9,7 +9,6 @@
     "back": "cross-env NODE_ENV=development nodemon server/back.js --watch server --exec babel-node",
     "build": "nuxt build",
     "start": "cross-env NODE_ENV=production babel-node server/index.js",
-    "docker": "cross-env NODE_ENV=production DOCKER_ENV=1 babel-node server/index.js",
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue .",
     "lintfix": "eslint --fix --ext .js,.vue .",