Author SHA1 Message Date
metas-dev 68737862ed update new release 5.173 2021-10-29 15:42:52 +02:00
metas-jb 699346e7f3 #69 disable caching for mobile in webui 2021-10-18 10:06:20 +02:00
metas-jb 76aa8b082f #69 disable caching for service-worker.js in webui 2021-10-12 12:02:59 +02:00
metas-jb ad40b8d10b #69 change mobile config.js to generalise path 2021-09-29 08:56:03 +02:00
metas-jb 09fdd7c7c9 #69 change Dockerfiles to include mobile config.js 2021-09-28 19:13:21 +02:00
metas-jb 8401d0c6e5 #69 add configs for mobile webui 2021-09-28 19:08:34 +02:00
metas-dev 8c9e9a8ec9 update new release 5.172 2021-09-17 13:54:26 +02:00
metas-dev 5c0a5e794a update new release 5.171 2021-09-03 18:03:34 +02:00
Julian Bischof 3995666cc7 Merge pull request #68 from metasfresh/openjdk_downgrade
revert back to openjdk-8 since 14 is not in ubuntu repo
2021-08-02 08:58:48 +02:00
58 changed files with 381 additions and 929 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-app:5.170
FROM metasfresh/metasfresh-app:5.173
COPY sources/configs/* /opt/metasfresh/
COPY sources/start_app.sh /opt/metasfresh/
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-db:5.170
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
+1 -1
View File
@@ -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.170.2-349+release/metasfresh-dist-dist-5.170.2-349+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
+1 -1
View File
@@ -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.170.2-349+release/metasfresh-webui-api-5.170.2-349+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
+1
View File
@@ -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/
@@ -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>
@@ -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>
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>
<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 /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 /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-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 /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 /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 /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 /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 /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
RewriteRule ^ - [L]
RewriteRule ^ /index.html
</Directory>
SSLCertificateFile /etc/apache2/certs/fullchain.pem
SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
<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 /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>
<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>
<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>
<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>
SSLCertificateFile /etc/apache2/certs/fullchain.pem
SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
</VirtualHost>
</IfModule>
@@ -0,0 +1,3 @@
const config = {
SERVER_URL: 'http://MYDOCKERHOST:PORT/app',
};
+1
View File
@@ -0,0 +1 @@
e05fb14f424a57e00beb2ccf2b96992cf35afff2
+1
View File
@@ -0,0 +1 @@
2021-10-25T11:33:52+02:00
+1
View File
@@ -0,0 +1 @@
e05fb14
File diff suppressed because one or more lines are too long
@@ -0,0 +1,142 @@
/*
object-assign
(c) Sindre Sorhus
@license MIT
*/
/*!
Copyright (c) 2018 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
/*!
* Sizzle CSS Selector Engine v2.3.6
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2021-02-16
*/
/*!
* jQuery JavaScript Library v3.6.0
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2021-03-02T17:08Z
*/
/*!
FullCalendar v5.9.0
Docs & License: https://fullcalendar.io/
(c) 2021 Adam Shaw
*/
/*! *****************************************************************************
Copyright (c) Microsoft Corporation.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
***************************************************************************** */
/*! @preserve
* numeral.js
* version : 2.0.6
* author : Adam Draper
* license : MIT
* http://adamwdraper.github.com/Numeral-js/
*/
/*! Hammer.JS - v2.0.7 - 2016-04-22
* http://hammerjs.github.io/
*
* Copyright (c) 2016 Jorik Tangelder;
* Licensed under the MIT license */
/*! JSON v3.3.2 | https://bestiejs.github.io/json3 | Copyright 2012-2015, Kit Cambridge, Benjamin Tan | http://kit.mit-license.org */
/*! tether 1.4.7 */
/**
* @license
* Lodash <https://lodash.com/>
* Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
* Released under MIT license <https://lodash.com/license>
* Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
* Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
*/
/**
* @version: 2.1.30
* @author: Dan Grossman http://www.dangrossman.info/
* @copyright: Copyright (c) 2012-2017 Dan Grossman. All rights reserved.
* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
* @website: http://www.daterangepicker.com/
*/
/** @license React v0.19.1
* scheduler.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/** @license React v16.13.1
* react-is.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/** @license React v16.14.0
* react-dom.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/** @license React v16.14.0
* react.production.min.js
*
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
//! Copyright (c) JS Foundation and other contributors
//! github.com/moment/moment-timezone
//! license : MIT
//! moment-timezone.js
//! moment.js
//! moment.js locale configuration
//! version : 0.5.33
File diff suppressed because one or more lines are too long
@@ -1 +0,0 @@
{"version":3,"file":"bundle-eead330d80d1be61fc46-git-ae9850b.js","sources":["webpack:///bundle-eead330d80d1be61fc46-git-ae9850b.js"],"mappings":"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","sourceRoot":""}

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

+1 -1
View File
@@ -1 +1 @@
<!doctype html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" name="viewport"><meta name="mobile-web-app-capable" content="yes"><link rel="icon" type="image/png" href="/favicon.png"><title>Metasfresh</title></head><body><div id="root"></div><script src="/config.js"></script><script src="/bundle-eead330d80d1be61fc46-git-ae9850b.js"></script></body></html>
<!doctype html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" name="viewport"><meta name="mobile-web-app-capable" content="yes"><link rel="icon" type="image/png" href="/favicon.png"><title>Metasfresh</title><script defer="defer" src="/bundle-e05fb14f424a57e00beb2ccf2b96992cf35afff2-git-dd849f270cde19eb3c6a.js"></script></head><body><div id="root"></div><script src="/config.js"></script></body></html>
+5 -5
View File
@@ -1,10 +1,10 @@
{
"build": {
"releaseVersion": "5.170.2-345+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh/job/release/345/",
"jenkinsBuildNo": "345",
"releaseVersion": "5.173.2-386+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh/job/release/386/",
"jenkinsBuildNo": "386",
"jenkinsJobName": "metasfresh/release",
"jenkinsBuildTag": "jenkins-metasfresh-release-345"
"gitSHA1": "ae9850bfbed65d089eb2bf0b6257e2b816ddff8b"
"jenkinsBuildTag": "jenkins-metasfresh-release-386"
"gitSHA1": "e05fb14f424a57e00beb2ccf2b96992cf35afff2"
}
}

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webapi:5.170
FROM metasfresh/metasfresh-webapi:5.173
COPY sources/configs/* /opt/metasfresh-webui-api/
COPY sources/start_webapi.sh /opt/metasfresh-webui-api/
+2 -1
View File
@@ -1,6 +1,7 @@
FROM metasfresh/metasfresh-webui:5.170
FROM metasfresh/metasfresh-webui:5.173
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/
@@ -72,6 +72,16 @@
ProxyPassReverse http://webapi:8080/info
</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>
<Directory /opt/metasfresh-webui-frontend/dist/>
Options Indexes FollowSymLinks
AllowOverride All
@@ -79,6 +89,7 @@
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>
@@ -73,6 +73,16 @@
ProxyPassReverse http://webapi:8080/info
</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>
<Directory /opt/metasfresh-webui-frontend/dist/>
Options Indexes FollowSymLinks
AllowOverride All
@@ -80,6 +90,7 @@
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>
@@ -91,7 +102,15 @@
Header set Pragma "no-cache"
Header set Expires "Wed, 21 Oct 2015 07:28:00 GMT"
</Files>
<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>
SSLCertificateFile /etc/apache2/certs/fullchain.pem
SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
</VirtualHost>
+3
View File
@@ -0,0 +1,3 @@
const config = {
SERVER_URL: 'http://MYDOCKERHOST:PORT/app',
};