Merge pull request #71 from metasfresh/gh69

release 5.173 including mobile
metasfresh · Oct 29, 2021 · 2615215 · 2615215
2 parents 8c9e9a8 + 6873786
commit 2615215
Show file tree

Hide file tree

Showing 21 changed files with 239 additions and 186 deletions.
diff --git a/app/Dockerfile b/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM metasfresh/metasfresh-app:5.172
+FROM metasfresh/metasfresh-app:5.173
 
 COPY sources/configs/* /opt/metasfresh/
 COPY sources/start_app.sh /opt/metasfresh/

diff --git a/db/Dockerfile b/db/Dockerfile
@@ -1,4 +1,4 @@
-FROM metasfresh/metasfresh-db:5.172
+FROM metasfresh/metasfresh-db:5.173
 
 RUN localedef -i de_DE -c -f UTF-8 -A /usr/share/locale/locale.alias de_DE.UTF-8
 RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

diff --git a/docker-src/app/Dockerfile b/docker-src/app/Dockerfile
@@ -12,7 +12,7 @@ RUN apt -y install netcat \
     && apt -y autoclean
 
 RUN mkdir -p /opt/metasfresh
-RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.172.2-377+release/metasfresh-dist-dist-5.172.2-377+release-dist.tar.gz \
+RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.173.2-389+release/metasfresh-dist-dist-5.173.2-389+release-dist.tar.gz \
   | tar -xzC /opt/metasfresh/ 
 RUN mkdir -p /opt/metasfresh/heapdump
 

diff --git a/docker-src/webapi/Dockerfile b/docker-src/webapi/Dockerfile
@@ -15,7 +15,7 @@ COPY sources/configs/local_settings.properties /root/
 RUN mkdir -p /opt/metasfresh-webui-api/metasfresh-webui-api \
     && mkdir -p /opt/metasfresh-webui-api/log \
     && mkdir -p /opt/metasfresh-webui-api/heapdump
-RUN curl https://repo.metasfresh.com/repository/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.172.2-377+release/metasfresh-webui-api-5.172.2-377+release.jar \
+RUN curl https://repo.metasfresh.com/repository/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.173.2-389+release/metasfresh-webui-api-5.173.2-389+release.jar \
     --output /opt/metasfresh-webui-api/metasfresh-webui-api.jar \
     && chmod 750 /opt/metasfresh-webui-api/metasfresh-webui-api.jar
 

diff --git a/docker-src/webui/Dockerfile b/docker-src/webui/Dockerfile
@@ -14,6 +14,7 @@ RUN mkdir -p /opt/metasfresh-webui-frontend
 
 COPY sources/dist /opt/metasfresh-webui-frontend/dist
 COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/
+COPY sources/configs/mobile/config.js /opt/metasfresh-webui-frontend/dist/mobile/
 
 #add apache config
 COPY sources/configs/metasfresh_webui.conf /etc/apache2/sites-available/

diff --git a/docker-src/webui/sources/configs/metasfresh_webui.conf b/docker-src/webui/sources/configs/metasfresh_webui.conf
@@ -1,86 +1,92 @@
 <VirtualHost *:80>
-        ProxyRequests Off
-        DocumentRoot /opt/metasfresh-webui-frontend/dist/
-        ErrorLog ${APACHE_LOG_DIR}/webui_error.log
-        CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
+    ProxyRequests Off
+    DocumentRoot /opt/metasfresh-webui-frontend/dist/
+    ErrorLog ${APACHE_LOG_DIR}/webui_error.log
+    CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
 
-        <Location /rest>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse  http://webapi:8080/rest/
-        </Location>
+    <Location /rest>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse  http://webapi:8080/rest/
+    </Location>
 
-        <Location /stomp>
-		Order allow,deny
-                Allow from all
-                RewriteEngine on
-		RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
-		RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
-		RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P] 
-                ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/stomp/
-        </Location>
+    <Location /stomp>
+            Order allow,deny
+            Allow from all
+            RewriteEngine on
+            RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
+            RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
+            RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
+            ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/stomp/
+    </Location>
 
-        <Location /info>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/info
-        </Location>
-
-        <Location /swagger-ui.html>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/swagger-ui.html
-        </Location>
+    <Location /info>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/info
+    </Location>
 
-        <Location /v2/api-docs>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/v2/api-docs/
-        </Location>
+    <Location /swagger-ui.html>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/swagger-ui.html
+    </Location>
 
-        <Location /swagger-resources>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/swagger-resources/
-        </Location>
+    <Location /v2/api-docs>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/v2/api-docs/
+    </Location>
 
-        <Location /webjars/springfox-swagger-ui>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
-        </Location>
+    <Location /swagger-resources>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/swagger-resources/
+    </Location>
 
-        <Location /configuration>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/configuration/
-        </Location>
+    <Location /webjars/springfox-swagger-ui>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
+    </Location>
 
-        <Location /info>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/info
-        </Location>
+    <Location /configuration>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/configuration/
+    </Location>
 
-	<Directory /opt/metasfresh-webui-frontend/dist/>
-                 Options Indexes FollowSymLinks
-                 AllowOverride All
-                 Require all granted
-		 RewriteEngine On
-		 RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
-		 RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
-		 RewriteRule ^ - [L]
-  		 RewriteRule ^ /index.html
-        </Directory>
+    <Location /info>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/info
+    </Location>
+
+    <Location /mobile>
+            Order allow,deny
+            Allow from all
+    </Location>
+
+    <Directory /opt/metasfresh-webui-frontend/dist/>
+            Options Indexes FollowSymLinks
+            AllowOverride All
+            Require all granted
+            RewriteEngine On
+            RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
+            RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
+            RewriteCond %{REQUEST_URI} !^/mobile?$
+            RewriteRule ^ - [L]
+            RewriteRule ^ /index.html
+    </Directory>
 </VirtualHost>
diff --git a/docker-src/webui/sources/configs/metasfresh_webui_ssl.conf b/docker-src/webui/sources/configs/metasfresh_webui_ssl.conf
@@ -1,82 +1,112 @@
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-        ProxyRequests Off
-        DocumentRoot /opt/metasfresh-webui-frontend/dist/
-        ErrorLog ${APACHE_LOG_DIR}/webui_error.log
-        CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
-        <Location /rest>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse  http://webapi:8080/rest/
-        </Location>
-
-	<Location /stomp>
-		Order allow,deny
-                Allow from all
-                RewriteEngine on
-		RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
-		RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
-		RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P] 
-                ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse ws://webapi:8080/stomp/
-                ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/stomp/
-        </Location>
-
-        <Location /info>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/info
-        </Location>
+    ProxyRequests Off
+    DocumentRoot /opt/metasfresh-webui-frontend/dist/
+    ErrorLog ${APACHE_LOG_DIR}/webui_error.log
+    CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
+
+
+    <Location /rest>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse  http://webapi:8080/rest/
+    </Location>
 
-        <Location /swagger-ui.html>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/swagger-ui.html
-        </Location>
+    <Location /stomp>
+            Order allow,deny
+            Allow from all
+            RewriteEngine on
+            RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
+            RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
+            RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
+            ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse ws://webapi:8080/stomp/
+            ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/stomp/
+    </Location>
+
+    <Location /info>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/info
+    </Location>
+
+    <Location /swagger-ui.html>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/swagger-ui.html
+    </Location>
+
+    <Location /v2/api-docs>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/v2/api-docs/
+    </Location>
+
+    <Location /swagger-resources>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/swagger-resources/
+    </Location>
+
+    <Location /webjars/springfox-swagger-ui>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
+    </Location>
+
+    <Location /configuration>
+            Order allow,deny
+            Allow from all
+            ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
+            ProxyPassReverse http://webapi:8080/configuration/
+    </Location>
 
-        <Location /v2/api-docs>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/v2/api-docs/
-        </Location>
+    <Location /mobile>
+            Order allow,deny
+            Allow from all
+            FileETag None
+            Header unset ETag
+            Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
+            Header set Pragma "no-cache"
+            Header set Expires "Wed, 21 Oct 2015 07:28:00 GMT"
+    </Location>
 
-        <Location /swagger-resources>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/swagger-resources/
-        </Location>
+    <Directory /opt/metasfresh-webui-frontend/dist/>
+            Options Indexes FollowSymLinks
+            AllowOverride All
+            Require all granted
+            RewriteEngine On
+            RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
+            RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
+            RewriteCond %{REQUEST_URI} !^/mobile?$
+            RewriteRule ^ - [L]
+            RewriteRule ^ /index.html
+    </Directory>
 
-        <Location /webjars/springfox-swagger-ui>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
-        </Location>
+    <Files index.html>
+            FileETag None
+            Header unset ETag
+            Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
+            Header set Pragma "no-cache"
+            Header set Expires "Wed, 21 Oct 2015 07:28:00 GMT"
+    </Files>
 
-        <Location /configuration>
-                Order allow,deny
-                Allow from all
-                ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
-                ProxyPassReverse http://webapi:8080/configuration/
-        </Location>
+    <Files service-worker.js>
+            FileETag None
+            Header unset ETag
+            Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
+            Header set Pragma "no-cache"
+            Header set Expires "Wed, 21 Oct 2015 07:28:00 GMT"
+    </Files>
 
-	<Directory /opt/metasfresh-webui-frontend/dist/>
-                 Options Indexes FollowSymLinks
-                 AllowOverride All
-                 Require all granted
-		 RewriteEngine On
-		 RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
-		 RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
-		 RewriteRule ^ - [L]
-  		 RewriteRule ^ /index.html
-        </Directory>
-SSLCertificateFile /etc/apache2/certs/fullchain.pem
-SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
+    SSLCertificateFile /etc/apache2/certs/fullchain.pem
+    SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
 </VirtualHost>
 </IfModule>
diff --git a/docker-src/webui/sources/configs/mobile/config.js b/docker-src/webui/sources/configs/mobile/config.js
@@ -0,0 +1,3 @@
+const config = {
+        SERVER_URL: 'http://MYDOCKERHOST:PORT/app',
+};
diff --git a/docker-src/webui/sources/dist/COMMITHASH b/docker-src/webui/sources/dist/COMMITHASH
@@ -1 +1 @@
-8ab1d7558e398335a7e5977d571767ce0226f75b
+e05fb14f424a57e00beb2ccf2b96992cf35afff2