Commit eddd1d7e authored by Guillaume Mella's avatar Guillaume Mella

do not change memory settings. they are now handled in pod / k8s deployement description

parent 15baa3bd
......@@ -3,8 +3,6 @@ IMAGE_TAG=1.4-beta
#SVN_TAG help to find tagged code or trunk ( path part of svn repo )
#SVN_TAG=trunk
SVN_TAG=tags/OIDB_V1_4-beta
OIDB_JAVA_XMS=1G
OIDB_JAVA_XMX=2G
#CLASSPATH=/exist/lib/extensions/exist-security-jmmc.jar:/exist/lib/exist.uber.jar:/exist/lib/user/commons-logging-1.1.3.jar:/exist/lib/user/commons-dbcp2-2.0.1.jar:/exist/lib/user/taplib-1.1b.jar:/exist/lib/user/commons-pool2-2.2.jar:/exist/lib/user/postgresql-42.1.1.jre7.jar:/exist/lib/user/exist-security-jmmc.jar:/exist/lib/user/oidb-tap-TRUNK.jar:/exist/lib/user/jmmc-realm-TRUNK-sources.jar:/exist/lib/user/oidb-tap-TRUNK-sources.jar
# see Dockerfile workarround
MYCLASSPATH=/exist/lib/extensions/exist-security-jmmc.jar:/exist/lib/exist.uber.jar:/exist/lib/user/commons-logging-1.1.3.jar:/exist/lib/user/commons-dbcp2-2.7.0.jar:/exist/lib/user/taplib-1.1b.jar:/exist/lib/user/commons-pool2-2.7.0.jar:/exist/lib/user/postgresql-42.2.8.jar:/exist/lib/user/exist-security-jmmc.jar:/exist/lib/user/oidb-tap-TRUNK.jar:/exist/lib/user/jmmc-realm-TRUNK-sources.jar:/exist/lib/user/oidb-tap-TRUNK-sources.jar:/exist/lib/user/jmal-TRUNK.jar:/exist/lib/user/oitools-TRUNK.jar:/exist/lib/user/oiexplorer-existdb-TRUNK.jar
......@@ -31,8 +31,6 @@ services:
context: oidb-existdb
args:
SVN_TAG: ${SVN_TAG}
OIDB_JAVA_XMS: ${OIDB_JAVA_XMS}
OIDB_JAVA_XMX: ${OIDB_JAVA_XMX}
MYCLASSPATH: ${MYCLASSPATH}
image: oidb-existdb:${IMAGE_TAG}
volumes:
......
......@@ -45,11 +45,6 @@ RUN $MVN install &&\
FROM existdb/existdb:5.0.0
ARG OIDB_JAVA_XMX
ARG OIDB_JAVA_XMS
ENV JAVA_TOOL_OPTIONS -Dfile.encoding=UTF8 -Dsun.jnu.encoding=UTF-8 -Djava.awt.headless=true -Dorg.exist.db-connection.cacheSize=256M -Dorg.exist.db-connection.pool.max=20 -Dlog4j.configurationFile=/exist/etc/log4j2.xml -Dexist.home=/exist -Dexist.configurationFile=/exist/etc/conf.xml -Djetty.home=/exist -Dexist.jetty.config=/exist/etc/jetty/standard.enabled-jetty-configs -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -XX:+UseStringDeduplication -Xms$OIDB_JAVA_XMS -Xmx$OIDB_JAVA_XMX
COPY --from=builder /tmp/exist/build/*.jar $EXIST_HOME/lib/user/
COPY --from=builder /tmp/exist/build/exist-security-jmmc.jar $EXIST_HOME/lib/extensions/
#ADD http://exist-db.org/exist/apps/public-repo/public/expath-ft-client-exist-lib-1.1.6.xar $EXIST_HOME/autodeploy/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment