SUCCESS - Merge pull request #54 from 5-Bits-in-a-Byte/docker-build

Docker Project setup merge with main
5-Bits-in-a-Byte · May 24, 2021 · fe23cbd · fe23cbd
2 parents ef07862 + 9959c5e
commit fe23cbd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -117,6 +117,6 @@ server/test-output.xml
 
 #vscode
 **.vscode
-
+docker-env
 run-dev-client.sh
 run-dev-server.sh
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -16,4 +16,4 @@ RUN npm install react-scripts@3.4.1 -g --silent
 COPY . ./
 
 # start app
-CMD ["npm", "start"]
+CMD ["npm", "run", "start"]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   flask:
     build: ./server
     env_file:
-    - ./server/docker-env
+      - ./server/docker-env
     ports:
       - "5000:5000"
   react:
@@ -12,5 +12,3 @@ services:
     #- ./client/react-env
     ports:
       - "3000:3000"
-
-
diff --git a/server/Dockerfile b/server/Dockerfile
@@ -3,8 +3,8 @@ FROM python:3.8
 COPY . /app
 WORKDIR /app
 
-RUN pip install -r requirements.txt 
+RUN pip install -r requirements.txt
+RUN pip install -e .
 EXPOSE 5000
 ENTRYPOINT [ "python" ]
-CMD [ "app.py" ]
-
+CMD [ "inquire/__init__.py" ]