Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
acad4b4a87 | ||
|
|
2ea54e9e71 | ||
|
|
99ae558713 | ||
|
|
9c0032d5ff | ||
|
|
1eb55a9cfa | ||
|
|
dae3363f45 | ||
|
|
eec088db25 | ||
|
|
1deaec32a4 | ||
|
|
52f9d41b1e | ||
|
|
c156ec15fb | ||
|
|
4f3d723489 | ||
|
|
2eaed5d1d0 | ||
|
|
bb45793fbe | ||
|
|
e75a2763bf | ||
|
|
175191f689 |
@@ -0,0 +1,2 @@
|
||||
# Legacy naming convention for docker containers
|
||||
COMPOSE_COMPATIBILITY=true
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
FROM metasfresh/metasfresh-app:5.175
|
||||
ARG BASE_REGISTRY=metasfresh
|
||||
FROM $BASE_REGISTRY/metasfresh-app:5.175
|
||||
|
||||
COPY sources/configs/* /opt/metasfresh/
|
||||
COPY sources/start_app.sh /opt/metasfresh/
|
||||
|
||||
@@ -27,6 +27,11 @@ spring.rabbitmq.port=5672
|
||||
spring.rabbitmq.username=metasfresh
|
||||
spring.rabbitmq.password=metasfresh
|
||||
|
||||
spring.rabbitmq.listener.direct.consumers-per-queue=1
|
||||
spring.rabbitmq.listener.direct.prefetch=1
|
||||
spring.rabbitmq.listener.simple.max-concurrency=1
|
||||
spring.rabbitmq.listener.simple.prefetch=1
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# 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
|
||||
@@ -34,3 +39,4 @@ spring.rabbitmq.password=metasfresh
|
||||
# Elasticsearch cluster name.
|
||||
spring.data.elasticsearch.cluster-name=metasfresh
|
||||
spring.data.elasticsearch.cluster-nodes=search:9300
|
||||
spring.data.elasticsearch.client.reactive.endpoints=search:9200
|
||||
|
||||
@@ -10,7 +10,6 @@ PID_FOLDER=/opt/metasfresh
|
||||
|
||||
JAVA_OPTS="\
|
||||
-Xmx1024M\
|
||||
-XX:MaxPermSize=512M\
|
||||
-XX:+HeapDumpOnOutOfMemoryError\
|
||||
-DPropertyFile=/opt/metasfresh/metasfresh.properties\
|
||||
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8788\
|
||||
|
||||
@@ -45,6 +45,13 @@ run_db_update()
|
||||
cd /opt/metasfresh/dist/install/ && java -jar ./lib/de.metas.migration.cli.jar $@
|
||||
}
|
||||
|
||||
# For Instances with Java8. Should have no effect on other java versions due to absolute paths used.
|
||||
# Need to remove this file or we get "java.awt.AWTError: Assistive Technology not found: org.GNOME.Accessibility.AtkWrapper" when running jasper reports
|
||||
remove_accessibility-properties(){
|
||||
rm -fv /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/accessibility.properties
|
||||
rm -fv /etc/java-8-openjdk/accessibility.properties
|
||||
}
|
||||
|
||||
run_metasfresh()
|
||||
{
|
||||
|
||||
@@ -82,6 +89,8 @@ wait_dbms
|
||||
|
||||
run_db_update
|
||||
|
||||
remove_accessibility-properties
|
||||
|
||||
run_metasfresh
|
||||
|
||||
exit 0
|
||||
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
FROM metasfresh/metasfresh-db:5.175
|
||||
ARG BASE_REGISTRY=metasfresh
|
||||
FROM $BASE_REGISTRY/metasfresh-db:5.175
|
||||
|
||||
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
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
FROM postgrest/postgrest:latest
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
FROM metasfresh/metasfresh-webapi:5.175
|
||||
ARG BASE_REGISTRY=metasfresh
|
||||
FROM $BASE_REGISTRY/metasfresh-webapi:5.175
|
||||
|
||||
COPY sources/configs/* /opt/metasfresh-webui-api/
|
||||
COPY sources/start_webapi.sh /opt/metasfresh-webui-api/
|
||||
|
||||
@@ -16,6 +16,11 @@ spring.rabbitmq.port=5672
|
||||
spring.rabbitmq.username=metasfresh
|
||||
spring.rabbitmq.password=metasfresh
|
||||
|
||||
spring.rabbitmq.listener.direct.consumers-per-queue=1
|
||||
spring.rabbitmq.listener.direct.prefetch=1
|
||||
spring.rabbitmq.listener.simple.max-concurrency=1
|
||||
spring.rabbitmq.listener.simple.prefetch=1
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# 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
|
||||
@@ -23,6 +28,7 @@ spring.rabbitmq.password=metasfresh
|
||||
# Elasticsearch cluster name.
|
||||
spring.data.elasticsearch.cluster-name=metasfresh
|
||||
spring.data.elasticsearch.cluster-nodes=search:9300
|
||||
spring.data.elasticsearch.client.reactive.endpoints=search:9200
|
||||
|
||||
# --------------------------------------------------------------------------------
|
||||
# Logging
|
||||
|
||||
@@ -25,7 +25,7 @@ wait_dbms()
|
||||
run_metasfresh()
|
||||
{
|
||||
cd /opt/metasfresh-webui-api/ && java -Dsun.misc.URLClassPath.disableJarChecking=true \
|
||||
-Xmx1024M -XX:MaxPermSize=512M \
|
||||
-Xmx1024M \
|
||||
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/metasfresh-webui-api/heapdump \
|
||||
-DPropertyFile=/opt/metasfresh-webui-api/metasfresh.properties \
|
||||
-Dcom.sun.management.jmxremote.port=1618 \
|
||||
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
FROM metasfresh/metasfresh-webui:5.175
|
||||
ARG BASE_REGISTRY=metasfresh
|
||||
FROM $BASE_REGISTRY/metasfresh-webui:5.175
|
||||
|
||||
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/
|
||||
COPY sources/configs/mobile/config.js /opt/metasfresh-webui-frontend/dist/mobile/
|
||||
|
||||
Reference in New Issue
Block a user