Merge pull request #134 from openimis/release/24.04

Release/24.04

.github/workflows/docker.yml

@@ -1,5 +1,6 @@
 name: create daily docker image on develop
 on:
+  workflow_dispatch:
   schedule:
    - cron: "0 2 * * *"
 jobs:

Dockerfile

@@ -24,7 +24,7 @@ COPY --from=build-stage /app/build/ /usr/share/nginx/html
 #COPY DEFAULT CERTS
 COPY --from=build-stage /etc/ssl/private/ /etc/nginx/ssl/live/host
 
-COPY conf/openimis.conf /conf/openimis.conf
+COPY ./conf /conf
 COPY script/entrypoint.sh /script/entrypoint.sh
 RUN chmod a+x /script/entrypoint.sh
 WORKDIR /script

README.md

@@ -1,35 +1,19 @@
-# openIMIS Frontend Reference Implementation : Windows Docker
+# openIMIS frontend assembly
 
-This repository holds the configuration files for the openIMIS Frontend Reference Implementation:
+## running
 
-- Legacy web application
-- Modular front end
+this repository builds:
 
-Please look for the direction on the openIMIS Wiki: https://openimis.atlassian.net/wiki/spaces/OP/pages/963182705/MO1.1+Install+the+modular+openIMIS+using+Docker
+- a docker image `ghcr.io/openimis/openimis-fe` that can be use in a docker compose
+- a minified js application that can be served by any webserver (see release)
 
-Note: the modular frontend is part of the release ZIP of the legacy webapp, if the modular frontend need to be changed then new modular frontend static files need to be placed in /inetroot/www/openIMIS/front
+the build content is defined by the openimis.json file
 
-Note 2: The docker file can be change to build first the frontend by uncommenting the "downloader" related lines.
-
-This repo branches, tags,... are maintained by openIMIS official delivery team who use it to build the official openIMIS Docker images containing the official modules (versions) list.
-
-In case of troubles, please consult/contact our service desk via our [ticketing site](https://openimis.atlassian.net/servicedesk/customer).
-
-# openIMIS Frontend Reference Implementation : Linux
-
-This repository holds the configuration files for the openIMIS Frontend Reference Implementation.
-It serves 2 distinct use cases:
-
-- developers who want to implement new modules or modify existing frontend modules of openIMIS
-- distributors who want to assemble modules into a Docker image for delivery
-
-Note: please, refer to [openIMIS Frontend localisation](i18n.md) to provide translations and bind user's language to a locale for data format (dates, numbers,...)
-
-This repo branches, tags,... are maintained by openIMIS official delivery team who use it to build the official openIMIS Docker images containing the official modules (versions) list.
-
-In case of troubles, please consult/contact our service desk via our [ticketing site](https://openimis.atlassian.net/servicedesk/customer).
-
-[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
+more information for:
+
+  - [docker Windows](/docs/WINDOWS_DOCKER.md) 
+  - [docker Linux](/docs/LINUX_DOCKER.md)
+  - [reverse proxy toward other openIMIS services](/docs/reverse_proxy.md)
 
 ## Developers setup
 

conf/locations/backend.loc

@@ -0,0 +1,21 @@
+
+    location /${REACT_APP_API_URL}/ {
+
+            proxy_pass http://${backend};
+            proxy_set_header   Host $host;
+            proxy_set_header   X-Real-IP $remote_addr;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Host $server_name;
+            proxy_set_header   X-Forwarded-Proto https;
+    }
+    location = /check_user/ {
+           internal;
+           proxy_pass_request_body off;
+           proxy_set_header Content-Length "";
+           proxy_set_header X-Original-URI $request_uri;
+           proxy_set_header X-Real-IP $remote_addr;
+           proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+           proxy_pass http://${backend}/${REACT_APP_API_URL}/core/users/current_user/;
+        }
+
+

conf/locations/certbot.loc

@@ -0,0 +1,3 @@
+location /.well-known/acme-challenge/ {
+        root /var/www/certbot;
+}

conf/locations/frontend.loc

@@ -0,0 +1,10 @@
+
+
+    location / {
+            return 302 https://$host/${PUBLIC_URL}/;
+        }
+
+    location /${PUBLIC_URL} {
+        try_files $uri $uri/  /${PUBLIC_URL}/index.html;
+        #error_page 404 $scheme://$host/front/;
+    }

conf/locations/lightning.loc

@@ -0,0 +1,14 @@
+
+    location /lightning/ {
+
+        rewrite /lightning/(.*) /$1  break;
+        proxy_pass http://${lightning};
+        proxy_set_header   Host $host;
+        proxy_set_header   X-Real-IP $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   X-Forwarded-Proto https;
+        proxy_set_header   X-Forwarded-Host $server_name;
+
+
+    }
+

conf/locations/opensearch.loc

@@ -0,0 +1,13 @@
+
+    location /opensearch/ {
+        auth_request /check_user/;
+        proxy_pass http://${opensearch};
+        proxy_set_header   Host $host;
+        proxy_set_header   X-Real-IP $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   X-Forwarded-Proto https;
+        proxy_set_header   X-Forwarded-Host $server_name;
+        proxy_set_header Authorization "Basic ${OPENSEARCH_BASIC_TOKEN}";
+
+    }
+

conf/locations/restapi.loc.bk

@@ -0,0 +1,14 @@
+
+
+    location /${ROOT_MOBILEAPI}/ {
+
+        #this rewrite rule is required to remove "ROOT_MOBILEAPI" because implicite rule (/ at the end of the url) donc work with variable
+        rewrite /${ROOT_MOBILEAPI}/(.*) /$1  break;
+        proxy_pass http://${restapi};
+        proxy_set_header   Host $host;
+        proxy_set_header   X-Real-IP $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   X-Forwarded-Proto https;
+        proxy_set_header   X-Forwarded-Host $server_name;
+
+    }

conf/openimis.conf

@@ -1,50 +1,20 @@
 
 server {
-        resolver 127.0.0.11 valid=30s;
-        set $dockerbackend "backend:8000";
-        set $dockerrestapi "restapi:80";
+    resolver 127.0.0.11 valid=30s;
 
-        client_max_body_size ${DATA_UPLOAD_MAX_MEMORY_SIZE};
-        listen       443 ssl;
-        listen 80;
-        server_name ${NEW_OPENIMIS_HOST};
 
-        ssl_certificate /etc/letsencrypt/live/${NEW_OPENIMIS_HOST}/fullchain.pem;
-        ssl_certificate_key /etc/letsencrypt/live/${NEW_OPENIMIS_HOST}/privkey.pem;
-        root /usr/share/nginx/html;
-        location /.well-known/acme-challenge/ {
-                root /var/www/certbot;
-        }
-        location /.well-known {
-                root /var/www/html;
-        }
+    client_max_body_size ${DATA_UPLOAD_MAX_MEMORY_SIZE};
+    listen       443 ssl;
+    listen 80;
+    server_name ${NEW_OPENIMIS_HOST};
 
-        location / {
-                return 302 https://$host/${PUBLIC_URL}/${REDIRECT_TAIL};
-        }
+    ssl_certificate /etc/letsencrypt/live/${NEW_OPENIMIS_HOST}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/${NEW_OPENIMIS_HOST}/privkey.pem;
+    root /usr/share/nginx/html;
 
-        location /${PUBLIC_URL} {
-                try_files $uri $uri/  /${PUBLIC_URL}/index.html;
-		#error_page 404 $scheme://$host/front/;
-        }
+    location /.well-known {
+            root /var/www/html;
+    }
+    ###INCLUDE_PLACEHOLDER###
 
-        location /${REACT_APP_API_URL}/ {
-                proxy_pass http://${dockerbackend};
-                proxy_set_header   Host $host;
-                proxy_set_header   X-Real-IP $remote_addr;
-                proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header   X-Forwarded-Host $server_name;
-                proxy_set_header   X-Forwarded-Proto https;
-        }
-
-        location /${ROOT_MOBILEAPI}/ {
-                #this rewrite rule is required to remove "ROOT_MOBILEAPI" because implicite rule (/ at the end of the url) donc work with variable
-                rewrite /${ROOT_MOBILEAPI}/(.*) /$1  break;
-                proxy_pass http://${dockerrestapi};
-                proxy_set_header   Host $host;
-                proxy_set_header   X-Real-IP $remote_addr;
-                proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
-                proxy_set_header   X-Forwarded-Proto https;
-                proxy_set_header   X-Forwarded-Host $server_name;
-        }
-}
+}

conf/variables/var.conf

@@ -0,0 +1,4 @@
+set $backend "backend:8000";
+set $opensearch "opensearch-dashboards:5601";
+set $lightning "lightning:4000";
+set $frontend "lightning:4000";