Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e5fcf78a89 | ||
|
|
4ef0bd253e | ||
|
|
d8c364a961 | ||
|
|
c1c5cbc36d | ||
|
|
f0ce15d819 | ||
|
|
e25f67253b | ||
|
|
fab8e757d2 | ||
|
|
c8277ddfdc | ||
|
|
ed77a5d887 | ||
|
|
f7be51dbea | ||
|
|
2f8cd2bd33 | ||
|
|
9969a9a910 | ||
|
|
6218b1e755 | ||
|
|
3e6466c573 | ||
|
|
7efc8de5f0 | ||
|
|
0690b592de | ||
|
|
dc5bf93c83 | ||
|
|
1f09a5421d | ||
|
|
347e2bfe04 | ||
|
|
aedaeff33c | ||
|
|
303dda46f0 | ||
|
|
0d60e88ae2 | ||
|
|
14a3f4d902 | ||
|
|
082430bd4b | ||
|
|
19cf9164da | ||
|
|
e295c54b65 | ||
|
|
abbcc46e22 | ||
|
|
009177e65f | ||
|
|
ac71df141a | ||
|
|
b23a02577d | ||
|
|
d1c5f5251a | ||
|
|
d346e9175d | ||
|
|
7ae7e5e36e | ||
|
|
cddb69b05f | ||
|
|
a3ec754700 | ||
|
|
5f46610e26 | ||
|
|
ef2750407c | ||
|
|
1f85ec31a3 | ||
|
|
e8a7637eb9 | ||
|
|
57553a1899 | ||
|
|
84c601b82e | ||
|
|
b02349c62b | ||
|
|
efe0bd1b51 | ||
|
|
f18f36a0de | ||
|
|
a1d7fce335 | ||
|
|
525ed0273c | ||
|
|
ca35200d63 | ||
|
|
669e8f3c95 | ||
|
|
9865ebb001 | ||
|
|
46fcb4b8d1 | ||
|
|
a56a2fff26 | ||
|
|
151c375d0e | ||
|
|
8ff97dd218 | ||
|
|
c20337e4d1 | ||
|
|
b00f55fdab | ||
|
|
ac98389632 | ||
|
|
e9802e22c5 | ||
|
|
95c732893f | ||
|
|
21274d18b3 | ||
|
|
c5afb10fa3 | ||
|
|
f22e037dab | ||
|
|
63c17874c1 | ||
|
|
814c8d7dbb | ||
|
|
a6a4fd5762 | ||
|
|
a2ca410c26 | ||
|
|
2edb764fdb | ||
|
|
1a4923b633 | ||
|
|
fff1c09030 | ||
|
|
0510102574 | ||
|
|
882411ae5f | ||
|
|
408a04e29b | ||
|
|
3dd1697d40 | ||
|
|
6e56f8d7d8 | ||
|
|
e9de51993f | ||
|
|
9dc81bc1f9 | ||
|
|
d182e97b3c | ||
|
|
3f4b435da2 | ||
|
|
a6f4af6f16 | ||
|
|
b0bb0fba8b | ||
|
|
a722d90b2a | ||
|
|
829585ee95 | ||
|
|
deda79ea32 | ||
|
|
4b68f2c550 | ||
|
|
b91973272c | ||
|
|
7c5de78cbd | ||
|
|
1b279110ab | ||
|
|
2ba9062ff7 | ||
|
|
6e15d2d111 | ||
|
|
4446fa2847 | ||
|
|
4b2dda7bb4 | ||
|
|
4a91741e84 | ||
|
|
7d851f2d71 | ||
|
|
a21095312f | ||
|
|
ffb5e7ddc3 | ||
|
|
7c0f07e8e5 | ||
|
|
a09ae838ec | ||
|
|
4dace546bd | ||
|
|
a44d4bef2b | ||
|
|
eead078c98 | ||
|
|
a4ec9b4cdf | ||
|
|
693bf63624 | ||
|
|
11b647e00e | ||
|
|
574087e073 |
@@ -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/
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,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
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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/
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 \
|
||||
|
||||
|
After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 117 KiB |
@@ -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>
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 636 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 95 KiB |
|
After Width: | Height: | Size: 90 KiB |
|
After Width: | Height: | Size: 95 KiB |
|
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 |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
@@ -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 |
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
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 |
|
After Width: | Height: | Size: 932 B |
|
After Width: | Height: | Size: 333 B |
@@ -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
|
||||
|
||||
@@ -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?
|
||||
@@ -0,0 +1 @@
|
||||
FROM rabbitmq:3.7.4
|
||||
@@ -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
|
||||
|
||||
@@ -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,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/
|
||||
|
||||
|
||||