Docker prod builds now can take environment varaibles

Flagsmith · Jun 1, 2020 · 0e8b7b0 · 0e8b7b0
1 parent ba74b10
commit 0e8b7b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,8 +21,6 @@ COPY --from=development --chown=root:root /srv/bt/node_modules ./node_modules
 COPY . .
 
 ENV ENV prod
-RUN npm run env
-RUN npm run bundle
 
 EXPOSE 8080
-CMD [ "npm", "run", "start" ]
+CMD [ "./bin/docker/run-docker.sh" ]
diff --git a/bin/docker/run-docker.sh b/bin/docker/run-docker.sh
@@ -0,0 +1,3 @@
+npm run env
+npm run bundle
+npm run start
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
@@ -4,14 +4,13 @@ services:
   bullettrain:
     build:
       context: .
-    command: npm run start
     environment:
       - API_URL=http://localhost:8000/api/v1/
       - ASSET_URL=http://localhost:8080/
     ports:
       - '8080:8080'
     volumes:
-      - chat_node_modules:/srv/chat/node_modules
+      - bt_node_modules:/srv/bt/node_modules
 
 volumes:
-  chat_node_modules:
+  bt_node_modules:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: .
       target: development
-      dockerfile: Dockerfile.dev
+      dockerfile: Dockerfile
     command: npm run dev
     environment:
       - API_URL=http://localhost:8000/api/v1/