5 Commits
Author SHA1 Message Date
Tobias Schöneberg 9d5f9d8dc4 Merge branch 'master' into gh4939-app 2019-02-26 17:22:01 +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
Tobias Schöneberg af4fef928a 4939-app - Configure c3p0's max db connection pool size
* explode uber-jar so we can simply add custom c3p0.properties files
* add support for not using cached base imaged for too long; see comment in Dockerfiles
https://github.com/metasfresh/metasfresh/issues/4939
2019-02-08 15:52:43 +01:00
32 changed files with 5875 additions and 167 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-app:5.89
FROM metasfresh/metasfresh-app:5.92
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.89
FROM metasfresh/metasfresh-db:5.92
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
+13 -1
View File
@@ -1,5 +1,9 @@
FROM ubuntu:16.04
# to make sure that the cache is only used during one day, run docker build --build-arg CACHEBUST=$(date "+%Y-%m-%d")
# that way we should get the latest updates since the release of our base image
# thx to https://github.com/moby/moby/issues/1996#issuecomment-185872769
ARG CACHEBUST=1
RUN apt update && apt -y full-upgrade
RUN apt autoclean && apt update
@@ -12,10 +16,18 @@ 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.88.2-894+release/metasfresh-dist-dist-5.88.2-894+release-dist.tar.gz \
RUN curl https://repo.metasfresh.com/content/repositories/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.92.2-912+release/metasfresh-dist-dist-5.92.2-912+release-dist.tar.gz \
| tar -xzC /opt/metasfresh/
RUN mkdir -p /opt/metasfresh/heapdump
# Explode the uber jar to make it easier to work with the docker image;
# e.g. with the exploded uber jar, we can later copy or overwrite config files into the docker image that change the applications behavior.
# Note that the skript start_materialdispo_docker.sh is adapted to the exploded jar.
# Note2 that we need unzip; jar doesn't work, thx to https://stackoverflow.com/a/39653862/1012103
RUN cd /opt/metasfresh \
&& (unzip -q /opt/metasfresh/metasfresh_server.jar || echo "Ignore exit code $? because spring boot's uber jar starts with a shell script") \
&& rm /opt/metasfresh/metasfresh_server.jar
COPY sources/configs/* /opt/metasfresh/
COPY sources/configs/local_settings.properties /root/
COPY sources/start_app.sh /opt/metasfresh/
@@ -0,0 +1,8 @@
# When the docker image is build, then this file overrides the default file which is present within the container.
#
# see https://www.mchange.com/projects/c3p0/index.html
c3p0.initialPoolSize=5
c3p0.minPoolSize=5
c3p0.maxPoolSize=25
c3p0.checkoutTimeout=0
+1 -1
View File
@@ -63,7 +63,7 @@ run_metasfresh()
-DPropertyFile=/opt/metasfresh/metasfresh.properties \
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8788 \
-Dcom.sun.net.ssl.enableECC=false \
-jar metasfresh_server.jar
org.springframework.boot.loader.JarLauncher
}
run_install
+17 -3
View File
@@ -1,5 +1,9 @@
FROM ubuntu:16.04
# to make sure that the cache is only used during one day, run docker build --build-arg CACHEBUST=$(date "+%Y-%m-%d")
# that way we should get the latest updates since the release of our base image
# thx to https://github.com/moby/moby/issues/1996#issuecomment-185872769
ARG CACHEBUST=1
RUN apt update && apt -y full-upgrade
RUN apt autoclean && apt update
@@ -8,6 +12,7 @@ RUN apt -y install netcat \
&& apt -y install curl \
&& apt -y install openjdk-8-jdk-headless \
&& apt -y install postgresql-client-9.5 \
&& apt -y install unzip \
&& apt -y autoremove \
&& apt -y autoclean
@@ -15,9 +20,18 @@ 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/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
RUN curl https://repo.metasfresh.com/content/repositories/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.92.2-669+release/metasfresh-webui-api-5.92.2-669+release.jar \
--output /opt/metasfresh-webui-api/metasfresh-webui-api.jar
# Explode the uber jar to make it easier to work with the docker image;
# e.g. with the exploded uber jar, we can later copy or overwrite config files into the docker image that change the applications behavior.
# Note that the skript start_materialdispo_docker.sh is adapted to the exploded jar.
# Note2 that we need unzip; jar doesn't work, thx to https://stackoverflow.com/a/39653862/1012103
RUN cd /opt/metasfresh/metasfresh-webui-api \
&& (unzip -q /opt/metasfresh/metasfresh-webui-api/metasfresh-webui-api || echo "Ignore exit code $? because spring boot's uber jar starts with a shell script") \
&& rm /opt/metasfresh/metasfresh-webui-api/metasfresh-webui-api
COPY sources/configs/* /opt/metasfresh-webui-api/
COPY sources/start_webapi.sh /opt/metasfresh-webui-api/
@@ -0,0 +1,8 @@
# When the docker image is build, then this file overrides the default file which is present within the container.
#
# see https://www.mchange.com/projects/c3p0/index.htmlc3p0.initialPoolSize=10
c3p0.initialPoolSize=10
c3p0.minPoolSize=10
c3p0.maxPoolSize=45
c3p0.checkoutTimeout=0
+1 -1
View File
@@ -35,7 +35,7 @@ run_metasfresh()
-Dcom.sun.management.jmxremote.authenticate=false \
-Dcom.sun.management.jmxremote.ssl=false \
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8789 \
-jar metasfresh-webui-api.jar
org.springframework.boot.loader.JarLauncher
}
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
+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="/bundle-a3286b9e598b3f8a5797-git-04092db.js"></script></body>
<script type="text/javascript" src="/bundle-4a65994cd6e363843353-git-36132f4.js"></script></body>
</html>
+5 -5
View File
@@ -1,10 +1,10 @@
{
"build": {
"releaseVersion": "5.88.2-278+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/278/",
"jenkinsBuildNo": "278",
"releaseVersion": "5.92.2-293+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/293/",
"jenkinsBuildNo": "293",
"jenkinsJobName": "metasfresh-webui-frontend/release",
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-278"
"gitSHA1": "04092dba7831b6aa8176632a310667b426162cda"
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-293"
"gitSHA1": "36132f4175cad8c99335bac536a8a562380ffbeb"
}
}
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

+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webapi:5.89
FROM metasfresh/metasfresh-webapi:5.92
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.89
FROM metasfresh/metasfresh-webui:5.92
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/