9 Commits
Author SHA1 Message Date
metas-jb ed07a702d0 #78 webui apply env variable for all config.js 2022-08-03 09:04:38 +02:00
Tobias Schöneberg 013d8831a1 add volume mount for external-lib and invoke serverRoot (app) to use it
https://github.com/metasfresh/metasfresh/issues/12892
2022-04-23 20:20:31 +02:00
metas-dev ffe484690e update new release 5.174 2022-03-25 14:25:21 +01:00
Kay d8aff21b20 Fixed link to "Create a database backup"
Doc was moved from `howto_collection` => `installation_collection`
2021-12-22 15:40:25 +01:00
Julian Bischof 77cb630320 Merge pull request #76 from metasfresh/gh75
#75 mitigate CVE-2021-44228 in elasticsearch container
2021-12-13 12:18:20 +01:00
metas-jb 42775f4fd8 #75 mitigate CVE-2021-44228 in elasticsearch container 2021-12-13 11:38:30 +01:00
Julian Bischof 63de0a32bb Merge pull request #73 from metasfresh/gh72
#72 add new apache redirects to webui
2021-11-24 09:38:05 +01:00
metas-jb 2d66c4d94f #72 add new apache redirects to webui 2021-11-11 11:52:57 +01:00
Julian Bischof 2615215bd9 Merge pull request #71 from metasfresh/gh69
release 5.173 including mobile
2021-10-29 16:43:09 +02:00
61 changed files with 119 additions and 58 deletions
+6 -6
View File
@@ -8,18 +8,18 @@ Additionally you will find the source files for modifying the core images in cas
## Installation: ##
In order to install metasfresh in a docker environment you're free to follow this guide:
[Install metasfresh on Docker](http://docs.metasfresh.org/installation_collection/EN/How_do_I_setup_the_metasfresh_stack_using_Docker.html)
[Install metasfresh on Docker](https://docs.metasfresh.org/installation_collection/EN/How_do_I_setup_the_metasfresh_stack_using_Docker.html)
[Install metasfresh on Docker - SSL](http://docs.metasfresh.org/installation_collection/EN/How_do_I_setup_metasfresh_docker_with_ssl.html)
[Install metasfresh on Docker - SSL](https://docs.metasfresh.org/installation_collection/EN/How_do_I_setup_metasfresh_docker_with_ssl.html)
## Guides: ##
* [Create a database backup](http://docs.metasfresh.org/howto_collection/EN/How_do_I_backup_metasfresh_docker.html)
* [Create a database backup](https://docs.metasfresh.org/installation_collection/EN/How_do_I_backup_metasfresh_docker.html)
* [Update your metasfresh-docker installation](http://docs.metasfresh.org/howto_collection/EN/How_do_I_update_metasfresh_using_Docker.html)
* [Update your metasfresh-docker installation](https://docs.metasfresh.org/howto_collection/EN/How_do_I_update_metasfresh_using_Docker.html)
* [Use the Java Swing Client with metasfresh-docker](http://docs.metasfresh.org/howto_collection/EN/How_do_I_use_Java_Client_using_Docker.html)
* [Use the Java Swing Client with metasfresh-docker](https://docs.metasfresh.org/howto_collection/EN/How_do_I_use_Java_Client_using_Docker.html)
* [Run multiple metasfresh-docker stacks / Change webui ports](http://docs.metasfresh.org/installation_collection/EN/How_do_I_change_the_webui_ports_for_metasfresh_docker.html)
* [Run multiple metasfresh-docker stacks / Change webui ports](https://docs.metasfresh.org/installation_collection/EN/How_do_I_change_the_webui_ports_for_metasfresh_docker.html)
## Frequent Questions: ##
* **Q: Where are the database files located at?**
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-app:5.173
FROM metasfresh/metasfresh-app:5.174
COPY sources/configs/* /opt/metasfresh/
COPY sources/start_app.sh /opt/metasfresh/
+10 -1
View File
@@ -53,12 +53,21 @@ run_metasfresh()
# info: https://docs.oracle.com/cd/E26362_01/E40761/html/known-bugs-issues.html
# https://stackoverflow.com/a/19379760
#2019-01-29 jb: added '-XX:HeapDumpPath=/opt/metasfresh/heapdump' to java opts
# gh issue: https://github.com/metasfresh/metasfresh-docker/issues/41
#2022-04-23 ts: added '-Dloader.path=/opt/metasfresh/external-lib':
# Allow loading jars from /opt/metasfresh/external-lib.
# This assumes that the app uses PropertiesLauncher (can be verified by opening the jar e.g. with 7-zip and checking META-INF/MANIFEST.MF)
# Also see https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html#executable-jar-property-launcher-features
cd /opt/metasfresh/ && java \
-Dsun.misc.URLClassPath.disableJarChecking=true \
-Xmx1024M -XX:MaxPermSize=512M \
-Xmx1024M \
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/metasfresh/heapdump \
-DPropertyFile=/opt/metasfresh/metasfresh.properties \
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8788 \
-Dloader.path=/opt/metasfresh/external-lib \
-Dcom.sun.net.ssl.enableECC=false \
-jar metasfresh_server.jar
}
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-db:5.173
FROM metasfresh/metasfresh-db:5.174
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
@@ -21,12 +21,12 @@ app:
- search:search
expose:
- "8282"
- "61616"
- "8788"
restart: always
volumes:
- ./volumes/app/log:/opt/metasfresh/log:rw
- ./volumes/app/heapdump:/opt/metasfresh/heapdump:rw
- ./volumes/app/external-lib:/opt/metasfresh/external-lib:rw
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
environment:
+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.173.2-389+release/metasfresh-dist-dist-5.173.2-389+release-dist.tar.gz \
RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.174.2-461+release/metasfresh-dist-dist-5.174.2-461+release-dist.tar.gz \
| tar -xzC /opt/metasfresh/
RUN mkdir -p /opt/metasfresh/heapdump
+7 -1
View File
@@ -56,12 +56,18 @@ run_metasfresh()
#2019-01-29 jb: added '-XX:HeapDumpPath=/opt/metasfresh/heapdump' to java opts
# gh issue: https://github.com/metasfresh/metasfresh-docker/issues/41
#2022-04-23 ts: added '-Dloader.path=/opt/metasfresh/external-lib':
# Allow loading jars from /opt/metasfresh/external-lib.
# This assumes that the app uses PropertiesLauncher (can be verified by opening the jar e.g. with 7-zip and checking META-INF/MANIFEST.MF)
# Also see https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html#executable-jar-property-launcher-features
cd /opt/metasfresh/ && java \
-Dsun.misc.URLClassPath.disableJarChecking=true \
-Xmx1024M -XX:MaxPermSize=512M \
-Xmx1024M \
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/metasfresh/heapdump \
-DPropertyFile=/opt/metasfresh/metasfresh.properties \
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8788 \
-Dloader.path=/opt/metasfresh/external-lib \
-Dcom.sun.net.ssl.enableECC=false \
-jar metasfresh_server.jar
}
+1
View File
@@ -19,6 +19,7 @@ app:
volumes:
- ./volumes/app/log:/opt/metasfresh/log:rw
- ./volumes/app/heapdump:/opt/metasfresh/heapdump:rw
- ./volumes/app/external-lib:/opt/metasfresh/external-lib:rw
- /etc/localtime:/etc/localtime:ro
environment:
- METASFRESH_HOME=/opt/metasfresh
+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.173.2-389+release/metasfresh-webui-api-5.173.2-389+release.jar \
RUN curl https://repo.metasfresh.com/repository/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.174.2-461+release/metasfresh-webui-api-5.174.2-461+release.jar \
--output /opt/metasfresh-webui-api/metasfresh-webui-api.jar \
&& chmod 750 /opt/metasfresh-webui-api/metasfresh-webui-api.jar
@@ -83,10 +83,18 @@
AllowOverride All
Require all granted
RewriteEngine On
# Existing file or directory
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
RewriteCond %{REQUEST_URI} !^/mobile?$
RewriteRule ^ - [L]
# mobile UI
RewriteCond %{REQUEST_URI} ^/mobile
RewriteRule ^ /mobile/index.html [L]
# Fallback:
RewriteRule ^ /index.html
</Directory>
</VirtualHost>
@@ -2,10 +2,18 @@
<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
# Logging
ErrorLog ${APACHE_LOG_DIR}/webui_error.log
CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
# Debugging
# NOTE: pls comment the ErrorLog and CustomLog entries above
#ErrorLog /dev/stdout
#TransferLog /dev/stdout
#LogLevel alert rewrite:trace8
<Location /rest>
Order allow,deny
Allow from all
@@ -78,33 +86,24 @@
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>
<Directory /opt/metasfresh-webui-frontend/dist/>
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
RewriteEngine On
<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>
# Existing file or directory
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
RewriteRule ^ - [L]
<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>
# mobile UI
RewriteCond %{REQUEST_URI} ^/mobile
RewriteRule ^ /mobile/index.html [L]
# Fallback:
RewriteRule ^ /index.html
</Directory>
SSLCertificateFile /etc/apache2/certs/fullchain.pem
SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
+1 -1
View File
@@ -1 +1 @@
e05fb14f424a57e00beb2ccf2b96992cf35afff2
829fb345925d3ac279c12bd33e5f1456b4ef40e8
+1 -1
View File
@@ -1 +1 @@
2021-10-25T11:33:52+02:00
2022-03-18T05:58:38+01:00
+1 -1
View File
@@ -1 +1 @@
e05fb14
829fb34
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long

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><script defer="defer" src="/bundle-e05fb14f424a57e00beb2ccf2b96992cf35afff2-git-dd849f270cde19eb3c6a.js"></script></head><body><div id="root"></div><script src="/config.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-829fb345925d3ac279c12bd33e5f1456b4ef40e8-git-600a28bfd186015be05e.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.173.2-386+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh/job/release/386/",
"jenkinsBuildNo": "386",
"releaseVersion": "5.174.2-458+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh/job/release/458/",
"jenkinsBuildNo": "458",
"jenkinsJobName": "metasfresh/release",
"jenkinsBuildTag": "jenkins-metasfresh-release-386"
"gitSHA1": "e05fb14f424a57e00beb2ccf2b96992cf35afff2"
"jenkinsBuildTag": "jenkins-metasfresh-release-458"
"gitSHA1": "829fb345925d3ac279c12bd33e5f1456b4ef40e8"
}
}

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

+4 -1
View File
@@ -1,7 +1,10 @@
#!/bin/bash
# if the environment parameter for "WEBAPI_URL" is set in docker-compose.yml, replace all placeholder variables with that parameter
# otherwise, a manual edit of './webui/sources/configs/config.js' and './webui/sources/configs/mobile/config.js' is required
#
if [[ ! -z $WEBAPI_URL ]]; then
sed -i 's,http\:\/\/MYDOCKERHOST\:PORT,'$WEBAPI_URL',g' /opt/metasfresh-webui-frontend/dist/config.js
find /opt/metasfresh-webui-frontend/dist/ -type f -name 'config.js' -exec sed -i 's,http\:\/\/MYDOCKERHOST\:PORT,'$WEBAPI_URL',g' {} +
fi
if [[ -f "/etc/apache2/certs/fullchain.pem" ]] && [[ -f "/etc/apache2/certs/privkey.pem" ]]; then
+3
View File
@@ -5,6 +5,9 @@ FROM docker.elastic.co/elasticsearch/elasticsearch:7.9.3
# Also see https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-cli-run-dev-mode
ENV discovery.type=single-node
# mitigate CVE-2021-44228 log4j2 vulnerability - http://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-44228
ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true
COPY sources/start-custom.sh /usr/local/bin/start-custom.sh
RUN chmod +x /usr/local/bin/start-custom.sh
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webapi:5.173
FROM metasfresh/metasfresh-webapi:5.174
COPY sources/configs/* /opt/metasfresh-webui-api/
COPY sources/start_webapi.sh /opt/metasfresh-webui-api/
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webui:5.173
FROM metasfresh/metasfresh-webui:5.174
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/
COPY sources/configs/mobile/config.js /opt/metasfresh-webui-frontend/dist/mobile/
+17 -1
View File
@@ -1,8 +1,17 @@
<VirtualHost *:80>
ProxyRequests Off
DocumentRoot /opt/metasfresh-webui-frontend/dist/
# Logging
ErrorLog ${APACHE_LOG_DIR}/webui_error.log
CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
# Debugging
# NOTE: pls comment the ErrorLog and CustomLog entries above
#ErrorLog /dev/stdout
#TransferLog /dev/stdout
#LogLevel alert rewrite:trace8
<Location /rest>
Order allow,deny
Allow from all
@@ -87,10 +96,17 @@
AllowOverride All
Require all granted
RewriteEngine On
# Existing file or directory
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
RewriteCond %{REQUEST_URI} !^/mobile?$
RewriteRule ^ - [L]
# mobile UI
RewriteCond %{REQUEST_URI} ^/mobile
RewriteRule ^ /mobile/index.html [L]
# Fallback:
RewriteRule ^ /index.html
</Directory>
@@ -2,8 +2,17 @@
<VirtualHost *:443>
ProxyRequests Off
DocumentRoot /opt/metasfresh-webui-frontend/dist/
# Logging
ErrorLog ${APACHE_LOG_DIR}/webui_error.log
CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
# Debugging
# NOTE: pls comment the ErrorLog and CustomLog entries above
#ErrorLog /dev/stdout
#TransferLog /dev/stdout
#LogLevel alert rewrite:trace8
<Location /rest>
Order allow,deny
Allow from all
@@ -17,7 +26,7 @@
RewriteEngine on
RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
ProxyPass wss://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse wss://webapi:8080/stomp/
ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
@@ -88,10 +97,17 @@
AllowOverride All
Require all granted
RewriteEngine On
# Existing file or directory
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
RewriteCond %{REQUEST_URI} !^/mobile?$
RewriteRule ^ - [L]
# mobile UI
RewriteCond %{REQUEST_URI} ^/mobile
RewriteRule ^ /mobile/index.html [L]
# Fallback:
RewriteRule ^ /index.html
</Directory>