Changes made,generate working project structure - yet to fix the postgres connection and the REST

Author: Rubix982

Makefile

@@ -8,10 +8,11 @@ remove:
 	sudo docker-compose down --remove-orphans
 
 build:
-	sudo docker-compose -f docker-compose.dev.yaml up --build
+	cd server && dotnet publish -c Release && cd ..
+	sudo docker-compose -f docker-compose.dev.yml up --build
 
 up:
-	sudo docker-compose -f docker-compose.dev.yaml up
+	sudo docker-compose -f docker-compose.dev.yml up
 
 ps:
 	sudo docker-compose ps -a

client/.dockerignore

@@ -0,0 +1 @@
+node_modules/**/**

client/Dockerfile

@@ -2,12 +2,10 @@ FROM node
 
 WORKDIR /App
 
-COPY ./package.json /App/
+COPY ./package.json ./yarn.lock /App/
 
-COPY ./yarn-lock.json /App/
-
-RUN npm install
+RUN yarn
 
 COPY ./ /App/
 
-CMD ["npm","start"]
+CMD ["yarn","start"]

docker-compose.dev.yml

@@ -11,23 +11,23 @@ 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
@@ -36,7 +36,8 @@ services:
     volumes:
       - "./server:/Backend"      
     ports:
-      - "5000:5000"
+      - "5000:5000" # For HTTP
+      - "5001:5001" # For HTTPS
 
   smtp:
     container_name: smtp
@@ -49,7 +50,7 @@ services:
       - "1080:1080"
 
   postgres:
-    name: primary
+    container_name: primary
     image: postgres:latest
     environment:
       - POSTGRES_USER={POSTGRES_USER}

docker-compose.yml

@@ -45,11 +45,11 @@ services:
       - SMTP_PORT=${SMTP_PORT}
       - HTTP_PORT=${HTTP_PORT}
     expose:
-      - "1025:1025"
-      - "1080:1080"
+      - "1025"
+      - "1080"
 
   postgres:
-    name: primary
+    container_name: primary
     image: postgres:latest
     environment:
       - POSTGRES_USER={POSTGRES_USER}

server/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "5.0.2",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

server/Dockerfile

@@ -0,0 +1,5 @@
+FROM microsoft/aspnetcore
+CMD [ "dotnet", 'publish', '-c', 'Release']
+COPY ./bin/Release/net5.0/publish App/
+WORKDIR /App
+ENTRYPOINT [ "dotnet", "NetCore.Docker.dll" ]