docker: add light image

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Author: pierre

ansible/templates/tomcat/conf/setenv.sh.j2

@@ -40,6 +40,7 @@ CATALINA_OPTS="-server
 {% endif %}
                -XX:SurvivorRatio={{ jvm_survivor_ratio }}
                -XX:+DisableExplicitGC
+{% if not lookup('env', 'TOMCAT_DISABLE_GC_LOGGING') %}
                -Xloggc:{{ catalina_base }}/logs/gc.log
                -XX:+PrintGCApplicationConcurrentTime
                -XX:+PrintGCApplicationStoppedTime
@@ -48,7 +49,9 @@ CATALINA_OPTS="-server
                -XX:+PrintTenuringDistribution
                -XX:+UseGCLogFileRotation
                -XX:NumberOfGCLogFiles=14
-               -XX:GCLogFileSize=100M"
+               -XX:GCLogFileSize=100M
+{% endif %}
+               "
 
 # Java Properties
 export CATALINA_OPTS="$CATALINA_OPTS

docker/templates/killbill/light/Dockerfile

@@ -1,9 +1,71 @@
 FROM killbill/killbill:0.20.11
 MAINTAINER Kill Bill core team <killbilling-users@googlegroups.com>
 
-RUN kpm uninstall kpm --destination=/var/lib/killbill/bundles
+# Install envsubst (see killbill.sh)
+USER root
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && \
+    apt-get install -y \
+      gettext-base && \
+    rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND teletype
+USER tomcat
 
-ENV TOMCAT_JAVA_XMS 1024m
-ENV TOMCAT_JAVA_XMX 1792m
-ENV TOMCAT_JAVA_NEW_SIZE 100m
-ENV TOMCAT_JAVA_MAX_NEW_SIZE 768m
+# Disable Ansible (requires /dev/shm)
+ENV KPM_INSTALL_CMD /bin/true
+
+# No JRuby plugin and no OSGI bundle, to keep memory usage low
+RUN kpm uninstall kpm --destination=$KILLBILL_INSTALL_DIR/bundles
+RUN rm -f $KILLBILL_INSTALL_DIR/bundles/platform/*
+
+# Pre-expand the Kill Bill WAR
+RUN cd $TOMCAT_HOME/webapps && \
+    mkdir ROOT && \
+    cd ROOT && \
+    jar -xvf ../ROOT.war && \
+    touch -r ../ROOT.war META-INF/war-tracker && \
+    cd - && \
+    rm -f ROOT.war && \
+    cd -
+
+# TODO
+# * The SocketFactory jdbc driver doesn't seem to be working on Cloud Run
+# * The Logback Stackdriver LoggingAppender isn't reliable
+#
+# Custom libraries
+#COPY lib/*.jar $TOMCAT_HOME/webapps/ROOT/WEB-INF/lib/
+# Hack for now...
+#RUN cd $TOMCAT_HOME/webapps/ROOT/WEB-INF/lib/ && \
+#    rm -f animal-sniffer-annotations-1.14.jar annotations-3.0.1u2.jar asm-5.0.3.jar commons-codec-1.9.jar commons-lang3-3.2.1.jar error_prone_annotations-2.1.3.jar google-api-services-sqladmin-v1beta4-rev20190510-1.28.0.jar j2objc-annotations-1.1.jar jackson-core-2.9.6.jar && \
+#    cd -
+
+# Add Kaui
+COPY webapps/kaui.war $TOMCAT_HOME/webapps/kaui.war
+
+# Pre-expand the Kaui WAR
+RUN cd $TOMCAT_HOME/webapps && \
+    mkdir kaui && \
+    cd kaui && \
+    jar -xvf ../kaui.war && \
+    touch -r ../kaui.war META-INF/war-tracker && \
+    cd - && \
+    rm -f kaui.war && \
+    cd -
+
+# TODO See above
+# Custom libraries
+#COPY lib/*.jar $TOMCAT_HOME/webapps/kaui/WEB-INF/lib/
+# Hack for now...
+#RUN cd $TOMCAT_HOME/webapps/kaui/WEB-INF/lib/ && \
+#    rm -f animal-sniffer-annotations-1.14.jar annotations-3.0.1u2.jar asm-5.0.3.jar commons-codec-1.9.jar commons-lang3-3.2.1.jar error_prone_annotations-2.1.3.jar google-api-services-sqladmin-v1beta4-rev20190510-1.28.0.jar j2objc-annotations-1.1.jar jackson-core-2.9.6.jar && \
+#    cd -
+
+# Note that classic configuration via environment variables won't work since Ansible isn't invoked
+COPY webapp-context.xml $TOMCAT_HOME/webapps/ROOT/META-INF/context.xml
+COPY webapp-context.xml $TOMCAT_HOME/webapps/kaui/META-INF/context.xml
+COPY context.xml $TOMCAT_HOME/conf/context.xml
+COPY server.xml $TOMCAT_HOME/conf/server.xml
+COPY setenv.sh $TOMCAT_HOME/bin/setenv.sh
+COPY logback.xml $KILLBILL_INSTALL_DIR/logback.xml
+COPY killbill.properties.template $KILLBILL_INSTALL_DIR/killbill.properties.template
+COPY killbill.sh $KILLBILL_INSTALL_DIR

docker/templates/killbill/light/README.md

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context unloadDelay="31000">
+</Context>

docker/templates/killbill/light/context.xml

@@ -0,0 +1,14 @@
+org.killbill.security.shiroNbHashIterations=1
+org.killbill.jaxrs.threads.pool.nb=5
+org.killbill.payment.plugin.threads.nb=1
+org.killbill.billing.osgi.bundles.jruby.conf.dir=/var/lib/killbill/config
+org.killbill.osgi.bundle.install.dir=/var/lib/killbill/bundles
+org.killbill.server.baseUrl=http://localhost:8080
+org.killbill.billing.osgi.dao.user=$KILLBILL_DAO_USER
+org.killbill.billing.osgi.dao.password=$KILLBILL_DAO_PASSWORD
+org.killbill.billing.osgi.dao.url=$KILLBILL_DAO_URL
+org.killbill.dao.user=$KILLBILL_DAO_USER
+org.killbill.dao.password=$KILLBILL_DAO_PASSWORD
+org.killbill.dao.url=$KILLBILL_DAO_URL
+org.killbill.dao.maxActive=10
+org.killbill.billing.osgi.dao.maxActive=10

docker/templates/killbill/light/killbill.properties.template

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+export KILLBILL_DAO_USER=${KILLBILL_DAO_USER:-killbill}
+export KILLBILL_DAO_PASSWORD=${KILLBILL_DAO_PASSWORD:-killbill}
+export KILLBILL_DAO_URL=${KILLBILL_DAO_URL:-jdbc:h2:mem:killbill}
+
+envsubst < $KILLBILL_INSTALL_DIR/killbill.properties.template > $KILLBILL_INSTALL_DIR/killbill.properties
+
+exec /usr/share/tomcat/bin/catalina.sh run