From 5c370423b3fa9d8a54d84172f0c6aaf4f7626fc3 Mon Sep 17 00:00:00 2001
From: Aquaticholic <aquaticholic@gmail.com>
Date: Fri, 8 Apr 2022 15:28:08 +0100
Subject: [PATCH] bawling out

---
 docker-compose.nginx.yml   | 19 +++++++++++++++++++
 docker-compose.prod.yml    | 16 ++++++++--------
 start_nginx.sh             |  1 +
 webserver/Dockerfile       |  1 +
 webserver/Dockerfile.nginx |  7 +++++++
 webserver/Dockerfile.prod  |  9 +++------
 webserver/package.json     |  4 ++--
 7 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 docker-compose.nginx.yml
 create mode 100644 start_nginx.sh
 create mode 100644 webserver/Dockerfile.nginx

diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml
new file mode 100644
index 0000000..5c2ad9a
--- /dev/null
+++ b/docker-compose.nginx.yml
@@ -0,0 +1,19 @@
+
+version: "3"
+
+services:
+  scouting-webserver-nginx:
+    container_name: "production"
+    restart: unless-stopped
+    env_file:
+      - .env
+    build:
+      context: ./webserver
+      dockerfile: ./Dockerfile.nginx
+    expose:
+      - 80
+    ports:
+      - "80:80/tcp"
+    volumes:
+      - ./build:/usr/share/nginx/html
+      - ./webserver/nginx:/etc/nginx/:ro
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 075e17c..90d7367 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -3,20 +3,20 @@ version: "3"
 services:
   scouting-webserver-prod:
     container_name: "production"
-    restart: unless-stopped
     env_file:
       - .env
     build:
       context: ./webserver
       dockerfile: ./Dockerfile.prod
-    expose:
-      - 80
-    ports:
-      - "80:80/tcp"
-      # - "80:80/tcp"
-      # - "443:443/tcp"
     volumes:
-      - ./webserver/nginx:/etc/nginx/:ro
+      - ./webserver:/app
+      # - ./webserver/build/:/app/build/
+      - ./webserver/build:/nooo/build
+      # - '/app/node_modules'
+      # - './webserver/public:/app/public/'
+      # - '/app/public/'
+      # - '/app/src/'
+      # - ./webserver/nginx:/etc/nginx/:ro
   # ssl-proxy:
   #   image: fsouza/docker-ssl-proxy
   #   ports:
diff --git a/start_nginx.sh b/start_nginx.sh
new file mode 100644
index 0000000..1fc04f0
--- /dev/null
+++ b/start_nginx.sh
@@ -0,0 +1 @@
+docker-compose -f docker-compose.nginx.yml up -d --build
\ No newline at end of file
diff --git a/webserver/Dockerfile b/webserver/Dockerfile
index 296aec2..2afcee6 100644
--- a/webserver/Dockerfile
+++ b/webserver/Dockerfile
@@ -10,4 +10,5 @@ RUN npm install
 RUN npm install react-scripts
 COPY . ./
 #USER node
+FROM nginx:1-alpine
 CMD ["npm", "start"]
diff --git a/webserver/Dockerfile.nginx b/webserver/Dockerfile.nginx
new file mode 100644
index 0000000..005bed6
--- /dev/null
+++ b/webserver/Dockerfile.nginx
@@ -0,0 +1,7 @@
+FROM nginx:1-alpine
+# COPY --from=build-step /app/build /usr/share/nginx/html
+RUN rm /etc/nginx/conf.d/default.conf
+# COPY nginx/nginx.conf /etc/nginx/conf.d
+EXPOSE 80
+# EXPOSE 443
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/webserver/Dockerfile.prod b/webserver/Dockerfile.prod
index 24a4975..40807ea 100644
--- a/webserver/Dockerfile.prod
+++ b/webserver/Dockerfile.prod
@@ -13,9 +13,6 @@ COPY . ./
 RUN npm run build
 
 FROM nginx:1-alpine
-COPY --from=build-step /app/build /usr/share/nginx/html
-RUN rm /etc/nginx/conf.d/default.conf
-# COPY nginx/nginx.conf /etc/nginx/conf.d
-EXPOSE 80
-# EXPOSE 443
-CMD ["nginx", "-g", "daemon off;"]
+RUN mkdir /nooo/
+RUN mkdir /nooo/build/
+COPY --from=build-step /app/build /nooo/build/
\ No newline at end of file
diff --git a/webserver/package.json b/webserver/package.json
index 374c109..e296fad 100644
--- a/webserver/package.json
+++ b/webserver/package.json
@@ -39,8 +39,8 @@
     "workbox-streams": "^5.1.4"
   },
   "scripts": {
-    "start": "react-scripts --max_old_space_size=4096 start",
-    "build": "react-scripts --max_old_space_size=4096 build",
+    "start": "react-scripts start",
+    "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },