Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4fc653d5cd | ||
|
|
6e15d2d111 | ||
|
|
4446fa2847 | ||
|
|
4b2dda7bb4 | ||
|
|
4a91741e84 | ||
|
|
7d851f2d71 | ||
|
|
a21095312f | ||
|
|
ffb5e7ddc3 | ||
|
|
7c0f07e8e5 | ||
|
|
a09ae838ec | ||
|
|
4dace546bd | ||
|
|
a44d4bef2b | ||
|
|
e1a2fffa75 | ||
|
|
eead078c98 | ||
|
|
a4ec9b4cdf | ||
|
|
dff0f243f3 | ||
|
|
bdb1409f7a | ||
|
|
693bf63624 | ||
|
|
7773bf8bbd | ||
|
|
b33ba922df | ||
|
|
11b647e00e | ||
|
|
574087e073 | ||
|
|
1c62c6e155 | ||
|
|
9cf659703e | ||
|
|
77f4309783 | ||
|
|
66cc1a05f6 | ||
|
|
8e82a58923 |
@@ -1,4 +1,4 @@
|
||||
FROM metasfresh/metasfresh-app:5.48
|
||||
FROM metasfresh/metasfresh-app:5.61
|
||||
|
||||
COPY sources/configs/* /opt/metasfresh/
|
||||
COPY sources/start_app.sh /opt/metasfresh/
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
server.port=8282
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# RabbitMQ
|
||||
# --------------------------------------------------------------------------------
|
||||
spring.rabbitmq.host=rabbitmq
|
||||
spring.rabbitmq.port=5672
|
||||
spring.rabbitmq.username=metasfresh
|
||||
spring.rabbitmq.password=metasfresh
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# Elasticsearch
|
||||
# for more properties, see https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchProperties.java
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM metasfresh/metasfresh-db:5.48
|
||||
FROM metasfresh/metasfresh-db:5.61
|
||||
|
||||
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
|
||||
|
||||
@@ -16,10 +16,12 @@ app:
|
||||
hostname: app
|
||||
links:
|
||||
- db:db
|
||||
- rabbitmq:rabbitmq
|
||||
- search:search
|
||||
expose:
|
||||
- "8282"
|
||||
- "61616"
|
||||
- "8788"
|
||||
restart: always
|
||||
volumes:
|
||||
- ./volumes/app/log:/opt/metasfresh/log:rw
|
||||
@@ -32,12 +34,15 @@ webapi:
|
||||
links:
|
||||
- app:app
|
||||
- db:db
|
||||
- rabbitmq:rabbitmq
|
||||
- search:search
|
||||
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"
|
||||
#- "8080:8080"
|
||||
restart: always
|
||||
volumes:
|
||||
- ./volumes/webapi/log:/opt/metasfresh-webui-api/log:rw
|
||||
@@ -57,6 +62,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,7 +12,7 @@ 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.48.2-582+release/metasfresh-dist-dist-5.48.2-582+release-dist.tar.gz \
|
||||
RUN curl https://repo.metasfresh.com/content/repositories/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.61.2-688+release/metasfresh-dist-dist-5.61.2-688+release-dist.tar.gz \
|
||||
| tar -xzC /opt/metasfresh/
|
||||
|
||||
COPY sources/configs/* /opt/metasfresh/
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
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
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# Elasticsearch
|
||||
# for more properties, see https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchProperties.java
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
|
||||
-- Thx to https://medium.com/contactually-engineering/postgres-at-scale-query-performance-and-autovacuuming-for-large-tables-d7e8ad40b16b
|
||||
ALTER SYSTEM SET autovacuum_vacuum_scale_factor = 0.05;
|
||||
ALTER SYSTEM SET autovacuum_analyze_scale_factor = 0.05;
|
||||
|
||||
-- Thx to https://blog.2ndquadrant.com/autovacuum-tuning-basics/
|
||||
ALTER TABLE ad_archive SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE ad_archive SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_referenceno_doc SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_referenceno_doc SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE ad_attachment SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE ad_attachment SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE ad_pinstance_para SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE ad_pinstance_para SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE ad_pinstance SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE ad_pinstance SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE ad_pinstance_log SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE ad_pinstance_log SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_subscriptionprogress SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_subscriptionprogress SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_invoice_line_alloc SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_invoice_line_alloc SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_invoiceline SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_invoiceline SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_doc_outbound_log_line SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_doc_outbound_log_line SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_referenceno SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_referenceno SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_doc_responsible SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_doc_responsible SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_invoice SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_invoice SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_printing_queue SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_printing_queue SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_invoicetax SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_invoicetax SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_doc_outbound_log SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_doc_outbound_log SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_payment SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_payment SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_allocationhdr SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_allocationhdr SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_allocationline SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_allocationline SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_contract_term_alloc SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_contract_term_alloc SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_olcand SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_olcand SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
-- not so big, but still need it, i think because a lot of changes are going on in there
|
||||
ALTER TABLE public.t_query_selection SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE public.t_query_selection SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE t_lock SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE t_lock SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE m_shipmentschedule_recompute SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE m_shipmentschedule_recompute SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_invoice_candidate_recompute SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_invoice_candidate_recompute SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE ESR_ImportLine SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE ESR_ImportLine SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE ESR_Import SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE ESR_Import SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_flatrate_term SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_flatrate_term SET (autovacuum_vacuum_threshold = 10000);
|
||||
|
||||
ALTER TABLE c_invoice_candidate SET (autovacuum_vacuum_scale_factor = 0);
|
||||
ALTER TABLE c_invoice_candidate SET (autovacuum_vacuum_threshold = 10000);
|
||||
@@ -14,7 +14,7 @@ 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.48.2-411+release/metasfresh-webui-api-5.48.2-411+release.jar \
|
||||
RUN curl https://repo.metasfresh.com/content/repositories/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.61.2-490+release/metasfresh-webui-api-5.61.2-490+release.jar \
|
||||
--output /opt/metasfresh-webui-api/metasfresh-webui-api.jar \
|
||||
&& chmod 750 /opt/metasfresh-webui-api/metasfresh-webui-api.jar
|
||||
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
|
||||
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
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# Elasticsearch
|
||||
# for more properties, see https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchProperties.java
|
||||
|
||||
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
@@ -4,6 +4,7 @@
|
||||
<meta charset="utf-8">
|
||||
<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>
|
||||
@@ -11,5 +12,6 @@
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script src="/config.js"></script>
|
||||
<script type="text/javascript" src="/bundlec7c888b9e5892088f9d3.js"></script></body>
|
||||
<script src="/plugins.js"></script>
|
||||
<script type="text/javascript" src="/bundle-f1f6ae58b5179825e749-git-fba6751.js"></script></body>
|
||||
</html>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"build": {
|
||||
"releaseVersion": "5.48.2-137+release",
|
||||
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/137/",
|
||||
"jenkinsBuildNo": "137",
|
||||
"releaseVersion": "5.61.2-180+release",
|
||||
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/180/",
|
||||
"jenkinsBuildNo": "180",
|
||||
"jenkinsJobName": "metasfresh-webui-frontend/release",
|
||||
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-137"
|
||||
"gitSHA1": "f7135dc76a4264260223f0943c89d0aa6c7290d5"
|
||||
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-180"
|
||||
"gitSHA1": "fba675159418004e2c23ec1a06a9a5e3b0f8daca"
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
@@ -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,31 @@
|
||||
msv3server:
|
||||
#IMPORTANT:
|
||||
# To use this server, you will need to manually create an additional user and database on
|
||||
# your 'db' docker-container which needs to be the same as the environment-variables below.
|
||||
# eg. on your docker-host:
|
||||
# docker exec -u postgres metasfreshdocker_db_1 psql -c "CREATE ROLE msv3server LOGIN ENCRYPTED PASSWORD 'md54154f6327b4f0de7252b668be051dd06' VALID UNTIL 'infinity';"
|
||||
# docker exec -u postgres metasfreshdocker_db_1 psql -c "CREATE DATABASE msv3server WITH ENCODING='UTF8' OWNER=msv3server CONNECTION LIMIT=-1;"
|
||||
#
|
||||
# For more info and variables, check: https://github.com/metasfresh/metasfresh-docker/issues/34
|
||||
build: msv3server
|
||||
mem_limit: 128m
|
||||
restart: always
|
||||
links:
|
||||
- db:db
|
||||
- rabbitmq:rabbitmq
|
||||
ports:
|
||||
- "8383:8080"
|
||||
volumes:
|
||||
- /etc/localtime:/etc/localtime:ro
|
||||
- /etc/timezone:/etc/timezone:ro
|
||||
environment:
|
||||
- DB_HOST=db
|
||||
- DB_NAME=msv3server
|
||||
- DB_USER=msv3server
|
||||
- DB_PASSWORD=msv3server
|
||||
- DB_PORT=5432
|
||||
- RABBITMQ_HOST=rabbitmq
|
||||
- RABBITMQ_USER=metasfresh
|
||||
- RABBITMQ_PASSWORD=metasfresh
|
||||
- RABBITMQ_PORT=5672
|
||||
- JAVA_MAX_HEAP=128M
|
||||
@@ -0,0 +1 @@
|
||||
FROM docker.metasfresh.com/metasfresh/de.metas.vertical.pharma.msv3.server:master_LATEST
|
||||
@@ -0,0 +1 @@
|
||||
FROM rabbitmq:3.7.4
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM metasfresh/metasfresh-webapi:5.48
|
||||
FROM metasfresh/metasfresh-webapi:5.61
|
||||
|
||||
COPY sources/configs/* /opt/metasfresh-webui-api/
|
||||
COPY sources/start_webapi.sh /opt/metasfresh-webui-api/
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
|
||||
server.port=8080
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# RabbitMQ
|
||||
# --------------------------------------------------------------------------------
|
||||
spring.rabbitmq.host=rabbitmq
|
||||
spring.rabbitmq.port=5672
|
||||
spring.rabbitmq.username=metasfresh
|
||||
spring.rabbitmq.password=metasfresh
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# Elasticsearch
|
||||
# for more properties, see https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchProperties.java
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM metasfresh/metasfresh-webui:5.48
|
||||
FROM metasfresh/metasfresh-webui:5.61
|
||||
|
||||
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/
|
||||
|
||||
|
||||