12 Commits
Author SHA1 Message Date
jb ad809e8765 #43 make java in containers aware of being inside a container 2019-02-06 10:33:32 +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
17 changed files with 55 additions and 22 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-app:5.87
FROM metasfresh/metasfresh-app:5.89
COPY sources/configs/* /opt/metasfresh/
COPY sources/start_app.sh /opt/metasfresh/
+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 \
-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 \
-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.87
FROM metasfresh/metasfresh-db:5.89
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
+4
View File
@@ -13,6 +13,7 @@ db:
- DB_SYSPASS=System
app:
build: app
mem_limit: 1280m
hostname: app
links:
- db:db
@@ -25,12 +26,14 @@ 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:
- METASFRESH_HOME=/opt/metasfresh
webapi:
build: webapi
mem_limit: 1280m
links:
- app:app
- db:db
@@ -46,6 +49,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:
+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.87.2-890+release/metasfresh-dist-dist-5.87.2-890+release-dist.tar.gz \
RUN curl https://repo.metasfresh.com/content/repositories/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.88.2-894+release/metasfresh-dist-dist-5.88.2-894+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/
+9 -1
View File
@@ -53,9 +53,17 @@ 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
#2019-02-06 jb: added '-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1' to java opts
# gh issue: https://github.com/metasfresh/metasfresh-docker/issues/43
# info: thx to https://blog.csanchez.org/2017/05/31/running-a-jvm-in-a-container-without-getting-killed/
cd /opt/metasfresh/ && java \
-Dsun.misc.URLClassPath.disableJarChecking=true \
-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError \
-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 \
-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 \
+4
View File
@@ -13,22 +13,26 @@ db:
app:
build: app
hostname: app
mem_limit: 1280m
links:
- db:db
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
webapi:
build: webapi
mem_limit: 1280m
links:
- app:app
- db:db
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.87.2-651+release/metasfresh-webui-api-5.87.2-651+release.jar \
&& mkdir -p /opt/metasfresh-webui-api/log \
&& mkdir -p /opt/metasfresh-webui-api/heapdump
RUN curl https://repo.metasfresh.com/content/repositories/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.88.2-655+release/metasfresh-webui-api-5.88.2-655+release.jar \
--output /opt/metasfresh-webui-api/metasfresh-webui-api.jar \
&& chmod 750 /opt/metasfresh-webui-api/metasfresh-webui-api.jar
+12 -1
View File
@@ -22,10 +22,21 @@ 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
#2019-01-29 jb: added '-XX:HeapDumpPath=/opt/metasfresh/heapdump' to java opts
# gh issue: https://github.com/metasfresh/metasfresh-docker/issues/41
#2019-02-06 jb: added '-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1' to java opts
# gh issue: https://github.com/metasfresh/metasfresh-docker/issues/43
# info: thx to https://blog.csanchez.org/2017/05/31/running-a-jvm-in-a-container-without-getting-killed/
run_metasfresh()
{
cd /opt/metasfresh-webui-api/ && java -Dsun.misc.URLClassPath.disableJarChecking=true \
-Xmx1024M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError \
-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 \
-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
@@ -12,5 +12,5 @@
<body>
<div id="root"></div>
<script src="/config.js"></script>
<script type="text/javascript" src="/bundle-813c2d8e3fcc7aa2f32e-git-62af4b2.js"></script></body>
<script type="text/javascript" src="/bundle-a3286b9e598b3f8a5797-git-04092db.js"></script></body>
</html>
+5 -5
View File
@@ -1,10 +1,10 @@
{
"build": {
"releaseVersion": "5.87.2-276+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/276/",
"jenkinsBuildNo": "276",
"releaseVersion": "5.88.2-278+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/278/",
"jenkinsBuildNo": "278",
"jenkinsJobName": "metasfresh-webui-frontend/release",
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-276"
"gitSHA1": "62af4b2015514c40d17ea446a353537cf63a473b"
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-278"
"gitSHA1": "04092dba7831b6aa8176632a310667b426162cda"
}
}
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webapi:5.87
FROM metasfresh/metasfresh-webapi:5.89
COPY sources/configs/* /opt/metasfresh-webui-api/
COPY sources/start_webapi.sh /opt/metasfresh-webui-api/
+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 \
-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=1 \
-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.87
FROM metasfresh/metasfresh-webui:5.89
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/