diff --git a/.gitignore b/.gitignore index 657922a8..76fb2d88 100644 --- a/.gitignore +++ b/.gitignore @@ -117,6 +117,6 @@ server/test-output.xml #vscode **.vscode - +docker-env run-dev-client.sh run-dev-server.sh \ No newline at end of file diff --git a/client/Dockerfile b/client/Dockerfile index 60e8e1a9..3bb9b4b9 100644 --- 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"] \ No newline at end of file +CMD ["npm", "run", "start"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 45baad5a..bb202c8c 100644 --- 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" - - \ No newline at end of file diff --git a/server/Dockerfile b/server/Dockerfile index 0606181d..346d391b 100644 --- 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" ]