Merge pull request #14 from oslabs-beta/dockerbash

Docker build&run succesfully

Author: delacour124

.env

@@ -1,4 +1,4 @@
 APP_DEV=true
 BROWSER=non
 SKIP_PREFLIGHT_CHECK=true
-MONGO_LINK=mongodb://0.0.0.0:27017
+MONGO_LINK=mongodb://127.0.0.1:27017

Dockerfile

@@ -20,7 +20,7 @@ COPY package.json .
 
 # RUN npm run install-once
 # # RUN npm install
-# RUN rm -rf node_modules
+RUN rm -rf node_modules
 # remove node modules from the file and only leave dependencies to be installed later 
 # RUN npm install -g npm@latest
 # USER node 

docker-compose.yml

@@ -2,10 +2,14 @@ version: "3"
 
 services:
   app:
-    image: spearmint:latest
-    build: .
+    image: spearmint
     environment:
-      - DISPLAY=0
-    volumes:
-      - /tmp/.X11-unix:/tmp/.X11-unix
-    network_mode: host
+      - DISPLAY= 172.17.0.1:0.0
+    command: npm run docker
+    # volumes:
+    #   - /tmp/.X11-unix:/tmp/.X11-unix
+  #   depends_on:
+  #     - mongo
+  # mongo:
+  #   image: mongo:latest
+  #   container_name: mongodb

public/electron.jsx

@@ -69,7 +69,7 @@ function createWindow() {
   // });
 
   mainWindow.loadFile(path.join(__dirname, 'index.html')); // unsure why we need the path.join, but index.html not found without it
-  mainWindow.webContents.openDevTools()
+  // mainWindow.webContents.openDevTools()
   //////////////////////////////////////////////////
   //Creates terminal, specifies dimensions based on columns and rows
   //////////////////////////////////////////////////