fix skf Docker local

Author: blabla1337

Docker/alpine/Dockerfile

@@ -24,7 +24,6 @@ RUN groupadd --gid 1000 user_skf && useradd --uid 1000 --gid user_skf -m user_sk
 
 ADD ./ /home/user_skf/
 RUN chmod a+rw /home/user_skf/skf/db /home/user_skf/skf/db/*
-COPY ./Docker/alpine/skf-angular.sh  /skf-angular.sh
 COPY ./Docker/alpine/entrypoint.sh  /entrypoint.sh
 COPY ./Docker/alpine/skf-api.sh  /skf-api.sh
 COPY ./Docker/alpine/wrapper.sh  /wrapper.sh
@@ -42,8 +41,10 @@ RUN apt update &&\
     openssl
 
 WORKDIR /home/user_skf/Angular
-RUN npm install -g @angular/cli > /dev/null
-RUN npm install
+RUN perl -pi -e "s/http:\/\/127.0.0.1:8888\/api/https:\/\/localhost\/api/" /home/user_skf/Angular/src/environments/environment.ts
+
+RUN npm --loglevel=error install &&\
+    npm run build --prod
 
 EXPOSE 443 80
 

Docker/alpine/site-tls.conf

@@ -22,16 +22,12 @@ server {
     ssl_ciphers 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256';
     ssl_prefer_server_ciphers on;
 
-    root /home/user_skf/Angular;
+    root /home/user_skf/Angular/dist;
     charset utf-8;
 
     location / {
-        proxy_pass http://localhost:4200;
+        try_files $uri $uri/ /index.html =404;
         proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
     }
 
     location /api/ {

Docker/alpine/site.conf

@@ -3,16 +3,12 @@
 server {
     listen 80 default_server;
 
-    root /home/user_skf/Angular;
+    root /home/user_skf/Angular/dist;
     charset utf-8;
 
     location / {
-        proxy_pass http://localhost:4200;
+        try_files $uri $uri/ /index.html =404;
         proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
     }
 
     location /api/ {

Docker/alpine/skf-angular.sh

@@ -24,10 +24,9 @@ fi
 
 while /bin/true; do
   PROCESS_1_STATUS=$(ps aux |grep -q skf-api* |grep -v grep)
-  PROCESS_2_STATUS=$(ps aux |grep -q skf-angular* | grep -v grep)
   # If the greps above find anything, they will exit with 0 status
   # If they are not both 0, then something is wrong
-  if [[ $PROCESS_1_STATUS -ne '0' || $PROCESS_2_STATUS -ne '0' ]]; then
+  if [[ $PROCESS_1_STATUS -ne '0' ]]; then
     echo "One of the processes has already exited."
     exit -1
   fi