Skip to content

Commit

Permalink
Updated folder structure
Browse files Browse the repository at this point in the history
  • Loading branch information
georgyKurian committed Sep 6, 2019
1 parent 114f5e6 commit 2319f74
Show file tree
Hide file tree
Showing 23 changed files with 27 additions and 43 deletions.
11 changes: 5 additions & 6 deletions Dockerfile → api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
FROM node:10

# create the working directory for the application called /app that will be the root
WORKDIR /app
WORKDIR /api

# Copy the current directory contents into the container at /app
COPY . /app
# Copy the current directory package.json into the container at /clent
COPY ./ /api/

# Install any needed packages specified in requirements.txt
# RUN pip install --trusted-host pypi.python.org -r requirements.txt

# Make port 80 available to the world outside this container
# Make port 3000 available to the world outside this container
EXPOSE 3000

# Define environment variable
ENV NAME development

# npm install the dependencies and run the start script from each package.json
CMD cd web && npm install && npm run start
CMD cd api && npm install && npm run start
CMD npm install && npm run start
32 changes: 0 additions & 32 deletions api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions client/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# download a base version of node from Docker Hub
FROM node:10

# create the working directory for the application called /app that will be the root
WORKDIR /client

# Copy the current directory package.json into the container at /clent
COPY ./ /client/

# Install any needed packages specified in requirements.txt
# RUN pip install --trusted-host pypi.python.org -r requirements.txt

# Make port 3000 available to the world outside this container
EXPOSE 80

# Define environment variable
ENV NAME development

# npm install the dependencies and run the start script from each package.json
CMD npm install && npm run build
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
image: node:10
restart: always
ports:
- 9000:9000
- 3000:3000
links:
- mongodb
networks:
Expand All @@ -21,7 +21,7 @@ services:
image: node:10
restart: always
ports:
- 3000:3000
- 80:80
volumes:
- ./client:/client
- /client/node_modules
Expand Down
3 changes: 0 additions & 3 deletions package-lock.json

This file was deleted.

0 comments on commit 2319f74

Please sign in to comment.