fix docker compose for root and client - everything integrates together!

Author: Rubix982

Makefile

@@ -8,7 +8,6 @@ remove:
 	sudo docker-compose down --remove-orphans
 
 build:
-	cd server && dotnet publish -c Release && cd ..
 	sudo docker-compose -f docker-compose.dev.yml up --build
 
 up:

client/Dockerfile

@@ -1,10 +1,10 @@
-FROM node
+FROM node:10
 
 WORKDIR /App
 
 COPY ./package.json ./yarn.lock /App/
 
-RUN yarn
+RUN yarn && yarn add [email protected] && npm rebuild node-sass
 
 COPY ./ /App/
 

client/README.md

@@ -11,4 +11,5 @@
 
 ## References
 
-- [Create-React-App with TypeScript, ESLint, Prettier, and Github Actions](https://medium.com/@brygrill/create-react-app-with-typescript-eslint-prettier-and-github-actions-f3ce6a571c97)
+- [Create-React-App with TypeScript, ESLint, Prettier, and Github Actions](https://medium.com/@brygrill/create-react-app-with-typescript-eslint-prettier-and-github-actions-f3ce6a571c97)
+- [Dotnet Docker - Github Repository](https://github.com/dotnet/dotnet-docker)

docker-compose.dev.yml

@@ -11,30 +11,30 @@ services:
       - ./web-server/nginx.conf:/etc/nginx/nginx.conf
     ports:
       - "8080:8080"
-    # depends_on:
-    #   - client
-    #   - server
-    #   - smtp
-    #   - postgres
-    #   - mongo
-    #   - cache  
+    depends_on:
+      - client
+      - server
+      - smtp
+      - postgres
+      - mongo
+      - cache        
 
-  # client:
-  #   container_name: client
-  #   build: ./client
-  #   stdin_open: true
-  #   restart: always
-  #   volumes:
-  #     - "./client:/App"
-  #   ports:
-  #     - "3000:3000"
+  client:
+    container_name: client
+    build: ./client
+    stdin_open: true
+    restart: always
+    volumes:
+      - "./client:/App"
+    ports:
+      - "3000:3000"
 
   server:
     container_name: backend
     build: ./server
     restart: always
     volumes:
-      - "./server:/Backend"      
+      - "./server:/backend"      
     ports:
       - "5000:5000" # For HTTP
       - "5001:5001" # For HTTPS