10 Commits
18 changed files with 19898 additions and 17144 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-app:5.48
FROM metasfresh/metasfresh-app:5.52
COPY sources/configs/* /opt/metasfresh/
COPY sources/start_app.sh /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
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-db:5.48
FROM metasfresh/metasfresh-db:5.52
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 -1
View File
@@ -20,6 +20,7 @@ app:
expose:
- "8282"
- "61616"
- "8788"
restart: always
volumes:
- ./volumes/app/log:/opt/metasfresh/log:rw
@@ -33,11 +34,13 @@ webapi:
- app:app
- db:db
- 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
+1 -1
View File
@@ -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.52.2-625+release/metasfresh-dist-dist-5.52.2-625+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
+1 -1
View File
@@ -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.52.2-438+release/metasfresh-webui-api-5.52.2-438+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
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
+2 -1
View File
@@ -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,5 @@
<body>
<div id="root"></div>
<script src="/config.js"></script>
<script type="text/javascript" src="/bundlec7c888b9e5892088f9d3.js"></script></body>
<script type="text/javascript" src="/bundle1ba74cbcf7276f6a9f19.js"></script></body>
</html>
+5 -5
View File
@@ -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.52.2-151+release",
"jenkinsBuildUrl": "https://jenkins.metasfresh.com/job/metasfresh-webui-frontend/job/release/151/",
"jenkinsBuildNo": "151",
"jenkinsJobName": "metasfresh-webui-frontend/release",
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-137"
"gitSHA1": "f7135dc76a4264260223f0943c89d0aa6c7290d5"
"jenkinsBuildTag": "jenkins-metasfresh-webui-frontend-release-151"
"gitSHA1": "e75eb9cebe6df6a2abaf43998fbacb6fbfad0407"
}
}
+31
View File
@@ -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
+1
View File
@@ -0,0 +1 @@
FROM docker.metasfresh.com/metasfresh/de.metas.vertical.pharma.msv3.server:master_LATEST
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webapi:5.48
FROM metasfresh/metasfresh-webapi:5.52
COPY sources/configs/* /opt/metasfresh-webui-api/
COPY sources/start_webapi.sh /opt/metasfresh-webui-api/
@@ -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
+1 -1
View File
@@ -1,4 +1,4 @@
FROM metasfresh/metasfresh-webui:5.48
FROM metasfresh/metasfresh-webui:5.52
COPY sources/configs/config.js /opt/metasfresh-webui-frontend/dist/