25 Commits
Author SHA1 Message Date
jb 626bc76a35 #39 add configs and permissions 2019-05-03 14:41:30 +02:00
jb aa846e4b8e #39 adding nginx as webui frontend 2019-04-30 16:42:30 +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
39 changed files with 6019 additions and 376 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-app:5.87
FROM metasfresh/metasfresh-app:5.101
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 \
-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.87
FROM metasfresh/metasfresh-db:5.101
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
+2
View File
@@ -25,6 +25,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:
@@ -46,6 +47,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.101.2-968+release/metasfresh-dist-dist-5.101.2-968+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.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.101.2-702+release/metasfresh-webui-api-5.101.2-702+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 \
+6 -28
View File
@@ -1,39 +1,17 @@
FROM ubuntu:16.04
FROM nginx
RUN apt update && apt -y full-upgrade
RUN apt autoclean && apt update
RUN apt -y install apache2 \
&& apt -y autoremove \
&& apt -y autoclean
RUN a2enmod proxy proxy_http proxy_html proxy_wstunnel rewrite ssl
RUN a2dissite 000-default.conf default-ssl.conf
RUN rm -rf /usr/share/nginx/html/*
RUN mkdir -p /opt/metasfresh-webui-frontend
RUN ln -s /usr/share/nginx/html /opt/metasfresh-webui-frontend/dist
COPY sources/dist /opt/metasfresh-webui-frontend/dist
COPY sources/configs/metasfresh_webui.conf /opt/
COPY sources/configs/metasfresh_webui_ssl.conf /opt/
COPY sources/dist /usr/share/nginx/html
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/
#add apache config
COPY sources/configs/metasfresh_webui.conf /etc/apache2/sites-available/
COPY sources/configs/metasfresh_webui_ssl.conf /etc/apache2/sites-available/
#set environment
RUN . /etc/apache2/envvars
ENV APACHE_RUN_USER www-data
ENV APACHE_RUN_GROUP www-data
ENV APACHE_PID_FILE /var/run/apache2.pid
ENV APACHE_RUN_DIR /var/run/apache2
ENV APACHE_LOCK_DIR /var/lock/apache2
ENV APACHE_LOG_DIR /var/log/apache2
RUN chown www-data:www-data -R /opt/metasfresh-webui-frontend/
#add entry-script
COPY sources/start_webui.sh /
RUN chmod +x /start_webui.sh
EXPOSE 80 443
ENTRYPOINT ["/start_webui.sh"]
@@ -1,86 +1,62 @@
<VirtualHost *:80>
ProxyRequests Off
DocumentRoot /opt/metasfresh-webui-frontend/dist/
ErrorLog ${APACHE_LOG_DIR}/webui_error.log
CustomLog ${APACHE_LOG_DIR}/webui_access.log combined
server {
listen 80 default_server;
<Location /rest>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/rest/
</Location>
proxy_buffering off;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
<Location /stomp>
Order allow,deny
Allow from all
RewriteEngine on
RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/stomp/
</Location>
location /rest {
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/rest/;
}
location /stomp {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
client_max_body_size 50M;
proxy_set_header X-Frame-Options SAMEORIGIN;
proxy_buffers 256 16k;
proxy_buffer_size 16k;
proxy_read_timeout 600s;
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/stomp/;
}
<Location /info>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/info
</Location>
<Location /swagger-ui.html>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/swagger-ui.html
</Location>
location /info {
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/info;
}
<Location /v2/api-docs>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/v2/api-docs/
</Location>
location /swagger-ui.html {
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/swagger-ui.html;
}
<Location /swagger-resources>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/swagger-resources/
</Location>
location /v2/api-docs {
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/v2/api-docs;
}
<Location /webjars/springfox-swagger-ui>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
</Location>
location /swagger-resources{
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/swagger-resources/;
}
<Location /configuration>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/configuration/
</Location>
location /webjars/springfox-swagger-ui{
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/webjars/springfox-swagger-ui/;
}
<Location /info>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/info
</Location>
location /configuration{
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/configuration/;
}
<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
RewriteRule ^ - [L]
RewriteRule ^ /index.html
</Directory>
</VirtualHost>
location /msv3 {
resolver 127.0.0.1;
set $msvproxy "MSV3_API_PROXYPASS_HOST:MSV3_API_PROXYPASS_PORT";
proxy_pass http://$msvproxy/;
}
location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri /index.html;
}
}
@@ -1,82 +1,72 @@
<IfModule mod_ssl.c>
<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
<Location /rest>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/rest/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/rest/
</Location>
<Location /stomp>
Order allow,deny
Allow from all
RewriteEngine on
RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
RewriteCond %{HTTP:CONNECTION} Upgrade$ [NC]
RewriteRule .* ws://webapi:8080%{REQUEST_URI} [P]
ProxyPass ws://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse ws://webapi:8080/stomp/
ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/stomp/
</Location>
<Location /info>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/info retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/info
</Location>
<Location /swagger-ui.html>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/swagger-ui.html retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/swagger-ui.html
</Location>
server {
listen 443 ssl default_server;
<Location /v2/api-docs>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/v2/api-docs/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/v2/api-docs/
</Location>
ssl_certificate /etc/ssl/certs/cert.pem;
ssl_certificate_key /etc/ssl/certs/privkey.pem;
ssl_session_timeout 30m;
ssl_session_cache builtin:1000 shared:SSL:10m;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4;
ssl_prefer_server_ciphers on;
<Location /swagger-resources>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/swagger-resources/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/swagger-resources/
</Location>
proxy_buffering off;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
<Location /webjars/springfox-swagger-ui>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/webjars/springfox-swagger-ui/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/webjars/springfox-swagger-ui/
</Location>
location /rest {
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/rest/;
}
location /stomp {
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
client_max_body_size 50M;
proxy_set_header X-Frame-Options SAMEORIGIN;
proxy_buffers 256 16k;
proxy_buffer_size 16k;
proxy_read_timeout 600s;
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/stomp/;
}
<Location /configuration>
Order allow,deny
Allow from all
ProxyPass http://webapi:8080/configuration/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/configuration/
</Location>
location /info {
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/info;
}
<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
RewriteRule ^ - [L]
RewriteRule ^ /index.html
</Directory>
SSLCertificateFile /etc/apache2/certs/fullchain.pem
SSLCertificateKeyFile /etc/apache2/certs/privkey.pem
</VirtualHost>
</IfModule>
location /swagger-ui.html {
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/swagger-ui.html;
}
location /v2/api-docs {
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/v2/api-docs;
}
location /swagger-resources{
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/swagger-resources/;
}
location /webjars/springfox-swagger-ui{
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/webjars/springfox-swagger-ui/;
}
location /configuration{
proxy_pass http://WEBUI_API_PROXYPASS_HOST:WEBUI_API_PROXYPASS_PORT/configuration/;
}
location /msv3 {
resolver 127.0.0.1;
set $msvproxy "MSV3_API_PROXYPASS_HOST:MSV3_API_PROXYPASS_PORT";
proxy_pass http://$msvproxy/;
}
location / {
root /usr/share/nginx/html;
index index.html index.htm;
# thx to https://github.com/react-boilerplate/react-boilerplate/blob/master/app/.nginx.conf
try_files $uri /index.html;
}
}
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-813c2d8e3fcc7aa2f32e-git-62af4b2.js"></script></body>
<script type="text/javascript" src="/bundle-b8656aa2b9b95eefca90-git-4f0e0d6.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.101.2-326+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/326/",
"jenkinsBuildNo": "326",
"jenkinsJobName": "metasfresh-webui-frontend/release",
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-276"
"gitSHA1": "62af4b2015514c40d17ea446a353537cf63a473b"
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-326"
"gitSHA1": "4f0e0d63e065719d587d9de7a1e7e5f214f977de"
}
}
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

+38 -7
View File
@@ -1,18 +1,49 @@
#!/bin/bash
webapi_client_host=${WEBUI_API_CLIENT_HOST:-webapi}
webapi_client_port=${WEBUI_API_CLIENT_PORT:-8080}
webapi_proxypass_host=${WEBUI_API_PROXYPASS_HOST:-webapi}
webapi_proxypass_port=${WEBUI_API_PROXYPASS_PORT:-8080}
msv3_proxypass_host=${MSV3_API_PROXYPASS_HOST:-msv3}
msv3_proxypass_port=${MSV3_API_PROXYPASS_PORT:-8080}
#Using the env-variable in docker-compose.yml to populate config.js
if [[ ! -z $WEBAPI_URL ]]; then
sed -i 's,http\:\/\/MYDOCKERHOST\:PORT,'$WEBAPI_URL',g' /opt/metasfresh-webui-frontend/dist/config.js
fi
if [[ -f "/etc/apache2/certs/fullchain.pem" ]] && [[ -f "/etc/apache2/certs/privkey.pem" ]]; then
if [[ -f "/etc/ssl/certs/cert.pem" ]] && [[ -f "/etc/ssl/certs/privkey.pem" ]]; then
sed -i 's/\bhttp\b/https/g' /opt/metasfresh-webui-frontend/dist/config.js
a2ensite metasfresh_webui_ssl.conf
echo "[METASFRESH] Activated SSL!"
cat /opt/metasfresh_webui_ssl.conf > /etc/nginx/conf.d/default.conf
SSL_ACTIVE="SSL"
else
sed -i 's/\https\b/http/g' /opt/metasfresh-webui-frontend/dist/config.js
a2ensite metasfresh_webui.conf
a2dissite metasfresh_webui_ssl.conf
echo "[METASFRESH] Runnning Non-SSL!"
cat /opt/metasfresh_webui.conf > /etc/nginx/conf.d/default.conf
SSL_ACTIVE="NON-SSL"
fi
/usr/sbin/apache2ctl -DFOREGROUND
sed -i 's/WEBUI_API_PROXYPASS_HOST/'${webapi_proxypass_host}'/g' /etc/nginx/conf.d/default.conf
sed -i 's/WEBUI_API_PROXYPASS_PORT/'${webapi_proxypass_port}'/g' /etc/nginx/conf.d/default.conf
sed -i 's/MSV3_API_PROXYPASS_HOST/'${msv3_proxypass_host}'/g' /etc/nginx/conf.d/default.conf
sed -i 's/MSV3_API_PROXYPASS_PORT/'${msv3_proxypass_port}'/g' /etc/nginx/conf.d/default.conf
echo "*************************************************************"
echo "Display the variable values we run with"
echo "*************************************************************"
echo ""
echo "WEBUI_API_PROXYPASS_HOST=$webapi_proxypass_host"
echo "WEBUI_API_PROXYPASS_PORT=$webapi_proxypass_port"
echo ""
echo "MSV3_API_PROXYPASS_HOST=$msv3_proxypass_host"
echo "MSV3_API_PROXYPASS_PORT=$msv3_proxypass_port"
echo ""
echo "SSL_ACTIVE=$SSL_ACTIVE"
echo "Start nginx -g 'daemon off;'"
nginx -g 'daemon off;'
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webapi:5.87
FROM metasfresh/metasfresh-webapi:5.101
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 \
-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 \
+5 -20
View File
@@ -1,26 +1,11 @@
FROM metasfresh/metasfresh-webui:5.87
FROM metasfresh/metasfresh-webui:5.101
COPY sources/certs /etc/ssl/certs
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/
COPY sources/configs/metasfresh_webui.conf /opt/
COPY sources/configs/metasfresh_webui_ssl.conf /opt/
#add apache config
COPY sources/configs/metasfresh_webui.conf /etc/apache2/sites-available/
RUN mkdir -p /etc/apache2/certs/
COPY sources/certs /etc/apache2/certs
RUN a2ensite metasfresh_webui.conf
#set environment
RUN . /etc/apache2/envvars
ENV APACHE_RUN_USER www-data
ENV APACHE_RUN_GROUP www-data
ENV APACHE_PID_FILE /var/run/apache2.pid
ENV APACHE_RUN_DIR /var/run/apache2
ENV APACHE_LOCK_DIR /var/lock/apache2
ENV APACHE_LOG_DIR /var/log/apache2
RUN chown www-data:www-data -R /opt/metasfresh-webui-frontend/
RUN chown www-data:www-data -R /opt/
EXPOSE 80 443
ENTRYPOINT ["/start_webui.sh"]