Changed order of operations, docker container builds the react app during composition

Author: EnderHubris

README.md

@@ -35,9 +35,8 @@ npm run build
 The following commands will build the docker via compose which builds the multi-docker system.
 You will also need to move the docker related `.env` into the docker folder (dir of Dockerfile) before running the following:
 ```bash
-cd docker
 docker network create traefik
-docker-compose -p khi up --build
+docker-compose --env-file .env -p khi -f docker/docker-compose.yml up --build
 ```
 The following commands will build ONLY the khi website docker image that you later start via `docker run -d ...`.
 ```bash

docker/Dockerfile

@@ -5,11 +5,29 @@ WORKDIR /
 # docker run -d --name khi_db -e MONGO_INITDB_ROOT_USERNAME=env.user -e MONGO_INITDB_ROOT_PASSWORD=env.password -e MONGO_INITDB_DATABASE=env.db -v mongodb_data:/data/db -p 27017:27017 mongo:latest
 RUN apt-get update && apt-get install -y supervisor sudo nodejs npm net-tools
 
+# ensure directories exist
+RUN mkdir /var/www
+RUN mkdir /var/www/khi
+RUN mkdir /var/www/project
+
+# give www-data ability to run commands and interact with web-root
+RUN chsh -s /bin/bash www-data
+RUN chown -R www-data:www-data /var/www
+
 # move production build into docker and move
 # nginx conf file into the docker
-COPY build /var/www/khi
-COPY package.json /var/www/khi/package.json
-COPY .env /var/www/khi/.env
+COPY public /var/www/project/public
+COPY src /var/www/project/src
+COPY .env /var/www/project/.env
+COPY package.json /var/www/project/package.json
+
+# create symlink to .env
+RUN ln -s /var/www/project/.env /var/www/khi/.env
+RUN ln -s /var/www/project/package.json /var/www/khi/package.json
+
+# build react app
+RUN su www-data -s /bin/sh -c "cd /var/www/project && npm install . && npm run build && cp -r build/* -t /var/www/khi"
+
 COPY docker/khi /etc/nginx/conf.d/khi.conf
 
 # move backend to web root
@@ -18,9 +36,6 @@ COPY backend /var/www/khi/backend
 # remove default nginx config
 RUN rm /etc/nginx/conf.d/default.conf
 
-# give www-data ability to run commands and interact with web-root
-RUN chsh -s /bin/bash www-data
-RUN chown -R www-data:www-data /var/www
 # install needed nodejs packages to allow the backend to run
 RUN su www-data -s /bin/sh -c "cd /var/www/khi && npm install ."
 

docker/init_mongo.sh

@@ -1,7 +1,10 @@
 #!/bin/bash
+# THIS SCRIPT IS RESPONSIBLE FOR CREATING THE SUPER ADMIN
+# FOR THE KHI WEBSITE (THIS ADMIN CANNOT BE REMOVED FROM THE ADMIN PANEL)
 
 username="admin" # OPTIONAL to change
 password="admin" # CHANGE THIS IN PRODUCTION
+
 salt="" # SALT .env
 hashed=$(echo -n "${salt}${password}" | sha256sum | awk '{print $1}')