Author SHA1 Message Date
mrie04 a79e7a81f3 remove legacy java opt 2023-07-13 13:28:07 +02:00
mrie04 0183bd124e update to java 17 2023-03-13 15:08:18 +01:00
mrie04 d9610dd781 update to java 17 2023-03-13 15:04:26 +01:00
Max Rieck 26aba7fda3 Merge pull request #81 from metasfresh/master_gh80_update_ubuntu_22_04
update ubuntu 20.04
2022-12-15 16:57:18 +01:00
mrie04 d5fca63168 revert app and webapi version 2022-12-15 16:01:00 +01:00
mrie04 8ff2bb62d1 update webui to ubuntu 20.04 2022-12-14 18:24:08 +01:00
mrie04 a0caac22d0 downgrade to ubuntu 20.04 for now 2022-12-13 16:03:55 +01:00
mrie04 09e221c100 update metasfresh_webui.conf 2022-12-07 12:47:34 +01:00
mrie04 04c5d352b4 update postgresql-client 2022-12-07 09:44:05 +01:00
mrie04 540479ff53 update ubuntu 22.04 2022-12-06 16:22:20 +01:00
Julian Bischof 6c08335fea Update Dockerfile 2022-11-08 14:13:26 +01:00
Julian Bischof 01ab1eaa56 Update Dockerfile 2022-11-08 13:40:51 +01:00
Julian Bischof cfd2409cc9 update db source to pg 13 2022-11-08 13:29:25 +01:00
Julian Bischof 67a530d5c5 Merge pull request #79 from metasfresh/gh78
#78 webui apply env variable for all config.js
2022-08-03 10:02:53 +02:00
8 changed files with 16 additions and 16 deletions
@@ -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\
+1 -1
View File
@@ -7,6 +7,6 @@ ENV LANG=de_DE.UTF-8
ENV LANGUAGE=en_US.UTF-8
ENV LC_MESSAGES=en_US.UTF-8
ENTRYPOINT ["/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["postgres"]
+4 -4
View File
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:20.04
RUN apt update && apt -y full-upgrade
@@ -6,13 +6,13 @@ RUN apt autoclean && apt update
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 openjdk-17-jdk-headless \
&& apt -y install postgresql-client-12 \
&& apt -y autoremove \
&& apt -y autoclean
RUN mkdir -p /opt/metasfresh
RUN curl https://repo.metasfresh.com/repository/mvn-release-releases/de/metas/dist/metasfresh-dist-dist/5.174.2-461+release/metasfresh-dist-dist-5.174.2-461+release-dist.tar.gz \
RUN curl https://repo.metasfresh.com/repository/mvn-master_java14-releases/de/metas/dist/metasfresh-dist-dist/5.176.2-63+masterjava14/metasfresh-dist-dist-5.176.2-63+masterjava14-dist.tar.gz \
| tar -xzC /opt/metasfresh/
RUN mkdir -p /opt/metasfresh/heapdump
+2 -2
View File
@@ -1,4 +1,4 @@
FROM postgres:9.5
FROM postgres:15.1
RUN apt update
RUN apt install -y curl
@@ -11,7 +11,7 @@ ENV LC_MESSAGES=en_US.UTF-8
COPY sources/create_db.sh /docker-entrypoint-initdb.d/
COPY sources/metasfresh.pgdump /tmp/
ENTRYPOINT ["/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
CMD ["postgres"]
EXPOSE 5432
+4 -4
View File
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:20.04
RUN apt update && apt -y full-upgrade
@@ -6,8 +6,8 @@ RUN apt autoclean && apt update
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 openjdk-17-jdk-headless \
&& apt -y install postgresql-client-12 \
&& apt -y autoremove \
&& apt -y autoclean
@@ -15,7 +15,7 @@ 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/repository/mvn-release/de/metas/ui/web/metasfresh-webui-api/5.174.2-461+release/metasfresh-webui-api-5.174.2-461+release.jar \
RUN curl https://repo.metasfresh.com/repository/mvn-master_java14/de/metas/ui/web/metasfresh-webui-api/5.176.2-63+masterjava14/metasfresh-webui-api-5.176.2-63+masterjava14.jar \
--output /opt/metasfresh-webui-api/metasfresh-webui-api.jar \
&& chmod 750 /opt/metasfresh-webui-api/metasfresh-webui-api.jar
+1 -1
View File
@@ -28,7 +28,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/heapdump \
-DPropertyFile=/opt/metasfresh-webui-api/metasfresh.properties \
-Dcom.sun.management.jmxremote.port=1618 \
+3 -2
View File
@@ -1,9 +1,10 @@
FROM ubuntu:16.04
FROM ubuntu:20.04
RUN apt update && apt -y full-upgrade
RUN apt autoclean && apt update
RUN apt -y install apache2 \
#thx to https://askubuntu.com/questions/909277/avoiding-user-interaction-with-tzdata-when-installing-certbot-in-a-docker-contai
RUN DEBIAN_FRONTEND="noninteractive" apt -y install apache2 \
&& apt -y autoremove \
&& apt -y autoclean
@@ -19,7 +19,7 @@
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
ProxyPassReverse ws://webapi:8080/stomp/
ProxyPass http://webapi:8080/stomp/ retry=0 acquire=3000 timeout=600 Keepalive=On
ProxyPassReverse http://webapi:8080/stomp/
</Location>