103 Commits
Author SHA1 Message Date
metas-jb e5fcf78a89 #49 add mandatory postgres password in compose base file 2020-02-18 11:14:21 +01:00
metas-dev 4ef0bd253e update new release 5.138 2020-02-14 20:49:04 +01:00
metas-dev d8c364a961 update new release 5.137 2020-02-07 14:51:45 +01:00
metas-dev c1c5cbc36d update new release 5.136 2020-01-31 16:52:56 +01:00
metas-dev f0ce15d819 update new release 5.135 2020-01-24 16:50:09 +01:00
metas-dev e25f67253b update new release 5.134 2020-01-17 17:16:17 +01:00
metas-dev fab8e757d2 update new release 5.133 2020-01-10 16:20:30 +01:00
metas-dev c8277ddfdc update new release 5.132 2019-12-20 16:24:51 +01:00
metas-dev ed77a5d887 update new release 5.131 2019-12-13 15:08:03 +01:00
metas-dev f7be51dbea update new release 5.130 2019-12-06 16:33:05 +01:00
metas-dev 2f8cd2bd33 update new release 5.129 2019-11-29 16:07:36 +01:00
metas-dev 9969a9a910 update new release 5.128 2019-11-22 17:05:54 +01:00
metas-dev 6218b1e755 update new release 5.127 2019-11-15 16:21:26 +01:00
metas-dev 3e6466c573 update new release 5.126 2019-11-11 08:36:38 +01:00
metas-dev 7efc8de5f0 update new release 5.125 2019-11-01 15:20:35 +01:00
metas-dev 0690b592de update new release 5.124 2019-10-25 16:40:49 +02:00
metas-dev dc5bf93c83 update new release 5.123 2019-10-18 16:27:10 +02:00
metas-dev 1f09a5421d update new release 5.122 2019-10-08 09:56:31 +02:00
metas-dev 347e2bfe04 update new release 5.121 2019-09-27 17:25:03 +02:00
metas-dev aedaeff33c update new release 5.120 2019-09-20 20:29:55 +02:00
metas-dev 303dda46f0 update new release 5.119 2019-09-13 20:32:21 +02:00
metas-dev 0d60e88ae2 update new release 5.118 2019-09-06 21:27:57 +02:00
metas-dev 14a3f4d902 update new release 5.117 2019-08-30 20:36:51 +02:00
metas-dev 082430bd4b update new release 5.116 2019-08-16 16:13:57 +02:00
metas-dev 19cf9164da update new release 5.115 2019-08-09 16:32:20 +02:00
metas-dev e295c54b65 update new release 5.114 2019-08-02 16:00:48 +02:00
metas-dev abbcc46e22 update new release 5.113 2019-07-26 16:38:11 +02:00
metas-dev 009177e65f update new release 5.112 2019-07-12 16:55:49 +02:00
metas-dev ac71df141a update new release 5.111 2019-07-05 16:10:32 +02:00
metas-dev b23a02577d update new release 5.110 2019-06-28 15:20:35 +02:00
metas-dev d1c5f5251a update new release 5.108 2019-06-21 14:59:42 +02:00
metas-dev d346e9175d update new release 5.107 2019-06-14 17:05:11 +02:00
metas-dev 7ae7e5e36e update new release 5.106 2019-05-31 16:32:11 +02:00
metas-dev cddb69b05f update new release 5.105 2019-05-24 16:22:48 +02:00
metas-dev a3ec754700 update new release 5.104 2019-05-17 16:34:09 +02:00
metas-dev 5f46610e26 update new release 5.103 2019-05-10 16:25:39 +02:00
metas-dev ef2750407c update new release 5.102 2019-05-03 15:53:19 +02:00
metas-dev 1f85ec31a3 update new release 5.101 2019-04-26 15:20:10 +02:00
metas-dev e8a7637eb9 update new release 5.100 2019-04-18 16:13:54 +02:00
metas-dev 57553a1899 update new release 5.99 2019-04-12 15:28:21 +02:00
metas-dev 84c601b82e update new release 5.98 2019-04-05 16:15:12 +02:00
metas-dev b02349c62b update new release 5.97 2019-03-29 15:40:47 +01:00
metas-dev efe0bd1b51 update new release 5.96 2019-03-22 16:29:58 +01:00
metas-dev f18f36a0de update new release 5.95 2019-03-15 20:48:08 +01:00
metas-dev a1d7fce335 update new release 5.94 2019-03-08 17:26:39 +01:00
metas-dev 525ed0273c update new release 5.93 2019-03-01 16:31:23 +01:00
metas-dev ca35200d63 update new release 5.92 2019-02-22 14:59:56 +01:00
metas-dev 669e8f3c95 update new release 5.91 2019-02-15 15:51:43 +01:00
metas-dev 9865ebb001 update new release 5.90 2019-02-08 16:51:20 +01:00
metas-dev 46fcb4b8d1 update new release 5.89 2019-02-01 17:18:24 +01:00
Julian Bischof a56a2fff26 Merge pull request #46 from metasfresh/revert-45-gh43
Revert "#43 changing functions for java memory allocation"
2019-02-01 16:26:27 +01:00
Julian Bischof 151c375d0e Revert "#43 changing functions for java memory allocation" 2019-02-01 16:17:58 +01:00
Julian Bischof 8ff97dd218 Merge pull request #45 from metasfresh/gh43
#43 changing functions for java memory allocation
2019-02-01 16:17:22 +01:00
metas-jb c20337e4d1 #43 changing functions for java memory allocation 2019-02-01 15:53:18 +01:00
Julian Bischof b00f55fdab Merge pull request #44 from metasfresh/gh41
Allow us to obtain java heap-dumps in case of an OutOfMemoryError
2019-02-01 15:21:17 +01:00
metas-jb ac98389632 #41 fix wrong directory entry 2019-02-01 14:58:46 +01:00
metas-jb e9802e22c5 #41 add functions to heapdump to start scripts 2019-02-01 14:49:06 +01:00
jb 95c732893f #41 fix wrong parameter 2019-01-29 17:22:22 +01:00
jb 21274d18b3 #41 add functions for deploying heapdump to volume 2019-01-29 17:01:20 +01:00
metas-dev c5afb10fa3 update new release 5.88 2019-01-25 18:31:08 +01:00
metas-dev f22e037dab update new release 5.87 2019-01-18 14:42:28 +01:00
metas-dev 63c17874c1 update new release 5.86 2019-01-11 15:27:03 +01:00
metas-dev 814c8d7dbb update new release 5.85 2018-12-21 15:58:52 +01:00
metas-dev a6a4fd5762 update new release 5.84 2018-12-14 17:00:45 +01:00
metas-dev a2ca410c26 update new release 5.83 2018-12-07 15:15:13 +01:00
metas-dev 2edb764fdb update new release 5.82 2018-11-30 15:35:21 +01:00
metas-dev 1a4923b633 update new release 5.81 2018-11-23 16:17:36 +01:00
metas-dev fff1c09030 update new release 5.80 2018-11-09 16:20:12 +01:00
metas-dev 0510102574 update new release 5.79 2018-11-02 17:03:27 +01:00
metas-dev 882411ae5f update new release 5.78 2018-10-26 16:24:11 +02:00
metas-dev 408a04e29b update new release 5.77 2018-10-22 12:01:27 +02:00
metas-dev 3dd1697d40 update new release 5.76 2018-09-28 16:10:31 +02:00
metas-dev 6e56f8d7d8 update new release 5.75 2018-09-21 17:09:32 +02:00
metas-dev e9de51993f update new release 5.74 2018-09-14 16:25:10 +02:00
metas-dev 9dc81bc1f9 update new release 5.73 2018-09-07 16:55:41 +02:00
metas-dev d182e97b3c update new release 5.72 2018-08-31 14:36:23 +02:00
metas-dev 3f4b435da2 update new release 5.71 2018-08-24 13:06:31 +02:00
metas-dev a6f4af6f16 update new release 5.70 2018-08-17 14:50:06 +02:00
metas-dev b0bb0fba8b update new release 5.69 2018-08-10 16:36:37 +02:00
metas-dev a722d90b2a update new release 5.68 2018-08-03 17:22:47 +02:00
metas-dev 829585ee95 update new release 5.67 2018-07-27 17:04:50 +02:00
metas-dev deda79ea32 update new release 5.66 2018-07-20 15:15:43 +02:00
Julian Bischof 4b68f2c550 add issue_template.md
For streamlining of adding new issues
2018-07-19 16:14:21 +02:00
metas-dev b91973272c update new release 5.65 2018-07-13 14:37:14 +02:00
metas-dev 7c5de78cbd update new release 5.64 2018-07-06 15:53:09 +02:00
metas-dev 1b279110ab update new release 5.63 2018-06-29 14:58:24 +02:00
metas-dev 2ba9062ff7 update new release 5.62 2018-06-22 13:09:17 +02:00
metas-dev 6e15d2d111 update new release 5.61 2018-06-15 14:32:56 +02:00
metas-dev 4446fa2847 update new release 5.60 2018-06-08 15:03:55 +02:00
metas-dev 4b2dda7bb4 update new release 5.59 2018-06-01 16:51:25 +02:00
metas-dev 4a91741e84 update new release 5.58 2018-05-25 15:31:16 +02:00
metas-dev 7d851f2d71 update new release 5.57 2018-05-18 17:31:33 +02:00
metas-dev a21095312f update new release 5.56 2018-05-11 16:36:04 +02:00
Tobias Schöneberg ffb5e7ddc3 Merge pull request #38 from n3w/master
updating javaclient.yml with rabbitmq configs
2018-05-08 11:10:05 +02:00
Norbert Wagner 7c0f07e8e5 updating javaclient.yml with rabbitmq configs 2018-05-07 22:06:43 +02:00
metas-dev a09ae838ec update new release 5.55 2018-05-04 16:58:08 +02:00
metas-dev 4dace546bd update new release 5.54 2018-04-27 15:25:56 +02:00
Julian Bischof a44d4bef2b Merge pull request #37 from metasfresh/gh36
add internally exposed ports for debugging
2018-04-24 14:51:42 +02:00
metas-dev eead078c98 update new release 5.53 2018-04-20 15:25:41 +02:00
Julian Bischof a4ec9b4cdf remove superfluous space caharacter in application.properties
removed a space character after `spring.rabbitmq.password=metasfresh` which prevented authentication to container `rabbitmq`
2018-04-18 14:43:13 +02:00
Julian Bischof 693bf63624 Merge pull request #35 from metasfresh/gh33
#33 add rabbitmq to Dockerfile and docker-compose
2018-04-17 12:08:19 +02:00
jb 11b647e00e change rabbitmq version to fixed version in Dockerfile 2018-04-11 16:13:41 +02:00
jb 574087e073 #33 add rabbitmq to Dockerfile and docker-compose 2018-04-11 15:14:22 +02:00
61 changed files with 6088 additions and 171861 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-app:5.52
FROM metasfresh/metasfresh-app:5.138
COPY sources/configs/* /opt/metasfresh/
COPY sources/start_app.sh /opt/metasfresh/
+7 -3
View File
@@ -1,8 +1,12 @@
server.port=8282
# issue https://github.com/metasfresh/metasfresh/issues/3772
# disable rabbitmq until it's contained in this stack
spring.profiles.active=eventbus_activemq
# --------------------------------------------------------------------------------
# RabbitMQ
# --------------------------------------------------------------------------------
spring.rabbitmq.host=rabbitmq
spring.rabbitmq.port=5672
spring.rabbitmq.username=metasfresh
spring.rabbitmq.password=metasfresh
# --------------------------------------------------------------------------------
# Elasticsearch
+2 -1
View File
@@ -55,7 +55,8 @@ run_metasfresh()
cd /opt/metasfresh/ && java \
-Dsun.misc.URLClassPath.disableJarChecking=true \
-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError \
-Xmx1024M -XX:MaxPermSize=512M \
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/metasfresh/heapdump \
-DPropertyFile=/opt/metasfresh/metasfresh.properties \
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8788 \
-Dcom.sun.net.ssl.enableECC=false \
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-db:5.52
FROM metasfresh/metasfresh-db:5.138
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
+18
View File
@@ -11,11 +11,13 @@ db:
- METASFRESH_PASSWORD=metasfresh
- METASFRESH_DBNAME=metasfresh
- DB_SYSPASS=System
- POSTGRES_PASSWORD=ip2LmNzXX8p8iXg9lZTWEJ9524kQDbXFudB7LR03T-xK9fLweX3TLMkA2AYcEiaS
app:
build: app
hostname: app
links:
- db:db
- rabbitmq:rabbitmq
- search:search
expose:
- "8282"
@@ -24,6 +26,7 @@ app:
restart: always
volumes:
- ./volumes/app/log:/opt/metasfresh/log:rw
- ./volumes/app/heapdump:/opt/metasfresh/heapdump:rw
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
environment:
@@ -33,6 +36,7 @@ webapi:
links:
- app:app
- db:db
- rabbitmq:rabbitmq
- search:search
expose:
- "8789"
@@ -44,6 +48,7 @@ webapi:
restart: always
volumes:
- ./volumes/webapi/log:/opt/metasfresh-webui-api/log:rw
- ./volumes/webapi/heapdump:/opt/metasfresh-webui-api/heapdump:rw
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
webui:
@@ -60,6 +65,19 @@ webui:
#uncomment and set to URL where metasfresh will be available from browsers
#environment:
#- WEBAPI_URL=http://example.com:8080
rabbitmq:
build: rabbitmq
expose:
- "5672"
restart: always
volumes:
- ./volumes/rabbitmq/log:/var/log/rabbitmq/log
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
environment:
RABBITMQ_DEFAULT_USER: "metasfresh"
RABBITMQ_DEFAULT_PASS: "metasfresh"
RABBITMQ_DEFAULT_VHOST: "/"
search:
build: search
ulimits:
+2 -1
View File
@@ -12,8 +12,9 @@ RUN apt -y install netcat \
&& apt -y autoclean
RUN mkdir -p /opt/metasfresh
RUN curl https://repo.metasfresh.com/content/repositories/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.52.2-625+release/metasfresh-dist-dist-5.52.2-625+release-dist.tar.gz \
RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.138.2-1170+release/metasfresh-dist-dist-5.138.2-1170+release-dist.tar.gz \
| tar -xzC /opt/metasfresh/
RUN mkdir -p /opt/metasfresh/heapdump
COPY sources/configs/* /opt/metasfresh/
COPY sources/configs/local_settings.properties /root/
+5 -1
View File
@@ -53,9 +53,13 @@ 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
cd /opt/metasfresh/ && java \
-Dsun.misc.URLClassPath.disableJarChecking=true \
-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError \
-Xmx1024M -XX:MaxPermSize=512M \
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/metasfresh/heapdump \
-DPropertyFile=/opt/metasfresh/metasfresh.properties \
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8788 \
-Dcom.sun.net.ssl.enableECC=false \
+2
View File
@@ -18,6 +18,7 @@ app:
restart: always
volumes:
- ./volumes/app/log:/opt/metasfresh/log:rw
- ./volumes/app/heapdump:/opt/metasfresh/heapdump:rw
- /etc/localtime:/etc/localtime:ro
environment:
- METASFRESH_HOME=/opt/metasfresh
@@ -29,6 +30,7 @@ webapi:
restart: always
volumes:
- ./volumes/webapi/log:/opt/metasfresh-webui-api/log:rw
- ./volumes/webapi/heapdump:/opt/metasfresh-webui-api/heapdump:rw
- /etc/localtime:/etc/localtime:ro
webui:
build: webui
+2
View File
@@ -22,6 +22,7 @@ services:
restart: always
volumes:
- ./volumes/app/log:/opt/metasfresh/log:rw
- ./volumes/app/heapdump:/opt/metasfresh/heapdump:rw
- /etc/localtime:/etc/localtime:ro
environment:
- METASFRESH_HOME=/opt/metasfresh
@@ -33,6 +34,7 @@ services:
restart: always
volumes:
- ./volumes/webapi/log:/opt/metasfresh-webui-api/log:rw
- ./volumes/webapi/heapdump:/opt/metasfresh-webui-api/heapdump:rw
- /etc/localtime:/etc/localtime:ro
webui:
+3 -2
View File
@@ -13,8 +13,9 @@ RUN apt -y install netcat \
COPY sources/configs/local_settings.properties /root/
RUN mkdir -p /opt/metasfresh-webui-api/metasfresh-webui-api \
&& mkdir -p /opt/metasfresh-webui-api/log
RUN curl https://repo.metasfresh.com/content/repositories/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.52.2-438+release/metasfresh-webui-api-5.52.2-438+release.jar \
&& 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.138.2-868+release/metasfresh-webui-api-5.138.2-868+release.jar \
--output /opt/metasfresh-webui-api/metasfresh-webui-api.jar \
&& chmod 750 /opt/metasfresh-webui-api/metasfresh-webui-api.jar
+5 -1
View File
@@ -22,10 +22,14 @@ wait_dbms()
done
}
#2019-01-29 jb: added '-XX:HeapDumpPath=/opt/metasfresh/heapdump' to java opts
# gh issue: https://github.com/metasfresh/metasfresh-docker/issues/41
run_metasfresh()
{
cd /opt/metasfresh-webui-api/ && java -Dsun.misc.URLClassPath.disableJarChecking=true \
-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError \
-Xmx1024M -XX:MaxPermSize=512M \
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/metasfresh/heapdump \
-DPropertyFile=/opt/metasfresh-webui-api/metasfresh.properties \
-Dcom.sun.management.jmxremote.port=1618 \
-Dcom.sun.management.jmxremote.authenticate=false \
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

+1 -2
View File
@@ -5,12 +5,11 @@
<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 href="https://fonts.googleapis.com/css?family=Roboto:400,400i,500,500i" rel="stylesheet">
<link rel="icon" type="image/png" href="/favicon.png">
<title>Metasfresh</title>
</head>
<body>
<div id="root"></div>
<script src="/config.js"></script>
<script type="text/javascript" src="/bundle1ba74cbcf7276f6a9f19.js"></script></body>
<script type="text/javascript" src="/bundle-bd468beeef15a2634c5d-git-485dff9.js"></script></body>
</html>
+6 -6
View File
@@ -1,10 +1,10 @@
{
"build": {
"releaseVersion": "5.52.2-151+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/151/",
"jenkinsBuildNo": "151",
"jenkinsJobName": "metasfresh-webui-frontend/release",
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-151"
"gitSHA1": "e75eb9cebe6df6a2abaf43998fbacb6fbfad0407"
"releaseVersion": "5.139.1-1988+master",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/master/1988/",
"jenkinsBuildNo": "1988",
"jenkinsJobName": "metasfresh-webui-frontend/master",
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-master-1988"
"gitSHA1": "485dff9644291e4aee62337d34aef3d08da57d18"
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 95 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 90 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 95 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 90 KiB

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

@@ -0,0 +1,2 @@
<!-- Icon comes from fontawesome.com under CC 4.0 license : https://fontawesome.com/license/free -->
<svg aria-hidden="true" data-prefix="fas" data-icon="barcode" class="svg-inline--fa fa-barcode fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#9aafbd" d="M0 448V64h18v384H0zm26.857-.273V64H36v383.727h-9.143zm27.143 0V64h8.857v383.727H54zm44.857 0V64h8.857v383.727h-8.857zm36 0V64h17.714v383.727h-17.714zm44.857 0V64h8.857v383.727h-8.857zm18 0V64h8.857v383.727h-8.857zm18 0V64h8.857v383.727h-8.857zm35.715 0V64h18v383.727h-18zm44.857 0V64h18v383.727h-18zm35.999 0V64h18.001v383.727h-18.001zm36.001 0V64h18.001v383.727h-18.001zm26.857 0V64h18v383.727h-18zm45.143 0V64h26.857v383.727h-26.857zm35.714 0V64h9.143v383.727H476zm18 .273V64h18v384h-18z"></path></svg>

After

Width:  |  Height:  |  Size: 801 B

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="list" class="svg-inline--fa fa-list fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#9aafbd" d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"></path></svg>

After

Width:  |  Height:  |  Size: 781 B

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="map-marked-alt" class="svg-inline--fa fa-map-marked-alt fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="#9aafbd" d="M288 0c-69.59 0-126 56.41-126 126 0 56.26 82.35 158.8 113.9 196.02 6.39 7.54 17.82 7.54 24.2 0C331.65 284.8 414 182.26 414 126 414 56.41 357.59 0 288 0zm0 168c-23.2 0-42-18.8-42-42s18.8-42 42-42 42 18.8 42 42-18.8 42-42 42zM20.12 215.95A32.006 32.006 0 0 0 0 245.66v250.32c0 11.32 11.43 19.06 21.94 14.86L160 448V214.92c-8.84-15.98-16.07-31.54-21.25-46.42L20.12 215.95zM288 359.67c-14.07 0-27.38-6.18-36.51-16.96-19.66-23.2-40.57-49.62-59.49-76.72v182l192 64V266c-18.92 27.09-39.82 53.52-59.49 76.72-9.13 10.77-22.44 16.95-36.51 16.95zm266.06-198.51L416 224v288l139.88-55.95A31.996 31.996 0 0 0 576 426.34V176.02c0-11.32-11.43-19.06-21.94-14.86z"></path></svg>

After

Width:  |  Height:  |  Size: 888 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

@@ -0,0 +1,2 @@
<!-- Icon comes from fontawesome.com under CC 4.0 license : https://fontawesome.com/license/free -->
<svg aria-hidden="true" data-prefix="fas" data-icon="qrcode" class="svg-inline--fa fa-qrcode fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#9aafbd" d="M0 224h192V32H0v192zM64 96h64v64H64V96zm192-64v192h192V32H256zm128 128h-64V96h64v64zM0 480h192V288H0v192zm64-128h64v64H64v-64zm352-64h32v128h-96v-32h-32v96h-64V288h96v32h64v-32zm0 160h32v32h-32v-32zm-64 0h32v32h-32v-32z"></path></svg>

After

Width:  |  Height:  |  Size: 529 B

@@ -0,0 +1,2 @@
<!-- Icon comes from fontawesome.com under CC 4.0 license : https://fontawesome.com/license/free -->
<svg aria-hidden="true" data-prefix="fas" data-icon="spinner" class="svg-inline--fa fa-spinner fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#9aafbd" d="M304 48c0 26.51-21.49 48-48 48s-48-21.49-48-48 21.49-48 48-48 48 21.49 48 48zm-48 368c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zm208-208c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM96 256c0-26.51-21.49-48-48-48S0 229.49 0 256s21.49 48 48 48 48-21.49 48-48zm12.922 99.078c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48c0-26.509-21.491-48-48-48zm294.156 0c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48c0-26.509-21.49-48-48-48zM108.922 60.922c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.491-48-48-48z"></path></svg>

After

Width:  |  Height:  |  Size: 890 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 932 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 333 B

+31 -2
View File
@@ -21,7 +21,10 @@ app:
- "61616:61616"
links:
- db:db
- rabbitmq:rabbitmq
- search:search
expose:
- "8788"
restart: always
volumes:
- ./volumes/app/log:/opt/metasfresh/log:rw
@@ -34,9 +37,13 @@ webapi:
links:
- app:app
- db:db
- rabbitmq:rabbitmq
- search:search
#for accessing the api directly (eg. for debugging or connecting your
#app to the metasfresh api) uncomment following lines:
expose:
- "8789"
# to access the webui-api directly
# (eg. for debugging or connecting your app to the metasfresh api)
# uncomment following port:
#ports:
#- "8080:8080"
restart: always
@@ -55,6 +62,22 @@ webui:
volumes:
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
#uncomment and set to URL where metasfresh will be available from browsers
#environment:
#- WEBAPI_URL=http://example.com:8080
rabbitmq:
build: rabbitmq
expose:
- "5672"
restart: always
volumes:
- ./volumes/rabbitmq/log:/var/log/rabbitmq/log
- /etc/localtime:/etc/localtime:ro
- /etc/timezone:/etc/timezone:ro
environment:
RABBITMQ_DEFAULT_USER: "metasfresh"
RABBITMQ_DEFAULT_PASS: "metasfresh"
RABBITMQ_DEFAULT_VHOST: "/"
search:
build: search
ulimits:
@@ -66,6 +89,12 @@ search:
hard: 65536
cap_add:
- IPC_LOCK
# to access the search api directly
# (e.g. if you did docker-compose up search to have the deachboard with your locally running metasfresh services)
# uncomment following ports:
# ports:
# - "9200:9200"
# - "9300:9300"
volumes:
- ./volumes/search/data:/usr/share/elasticsearch/data
- /etc/localtime:/etc/localtime:ro
+7
View File
@@ -0,0 +1,7 @@
### Is this a bug or feature request?
### What is the current behavior?
### Which are the steps to reproduce?
### What is the expected or desired behavior?
+1
View File
@@ -0,0 +1 @@
FROM rabbitmq:3.7.4
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webapi:5.52
FROM metasfresh/metasfresh-webapi:5.138
COPY sources/configs/* /opt/metasfresh-webui-api/
COPY sources/start_webapi.sh /opt/metasfresh-webui-api/
@@ -3,9 +3,13 @@
server.port=8080
# issue https://github.com/metasfresh/metasfresh/issues/3772
# disable rabbitmq until it's contained in this stack
spring.profiles.active=eventbus_activemq
# --------------------------------------------------------------------------------
# RabbitMQ
# --------------------------------------------------------------------------------
spring.rabbitmq.host=rabbitmq
spring.rabbitmq.port=5672
spring.rabbitmq.username=metasfresh
spring.rabbitmq.password=metasfresh
# --------------------------------------------------------------------------------
# Elasticsearch
+2 -1
View File
@@ -25,7 +25,8 @@ wait_dbms()
run_metasfresh()
{
cd /opt/metasfresh-webui-api/ && java -Dsun.misc.URLClassPath.disableJarChecking=true \
-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError \
-Xmx1024M -XX:MaxPermSize=512M \
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/metasfresh-webui-api/heapdump \
-DPropertyFile=/opt/metasfresh-webui-api/metasfresh.properties \
-Dcom.sun.management.jmxremote.port=1618 \
-Dcom.sun.management.jmxremote.authenticate=false \
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webui:5.52
FROM metasfresh/metasfresh-webui:5.138
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/