Merge pull request #16 from ibissource/CleanUpOnAisleFive

feat: Stand-alone JWT support in Kubernetes

Dockerfile

@@ -0,0 +1,27 @@
+FROM nexus.frankframework.org/frank-framework:7.9-SNAPSHOT
+
+# TempFix TODO: Move this to the credentialprovider.properties
+ENV credentialFactory.class=nl.nn.credentialprovider.PropertyFileCredentialFactory
+ENV credentialFactory.map.properties=/opt/frank/resources/credentials.properties
+
+# Copy dependencies
+COPY --chown=tomcat lib/server/ /usr/local/tomcat/lib/
+COPY --chown=tomcat lib/webapp/ /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/
+
+# When deploying the "context.xml" should be copied to /usr/local/tomcat/conf/Catalina/localhost/ROOT.xml
+COPY --chown=tomcat src/main/webapp/META-INF/context.xml /usr/local/tomcat/conf/Catalina/localhost/ROOT.xml
+
+# Copy Frank!
+COPY --chown=tomcat src/main/configurations/ /opt/frank/configurations/
+COPY --chown=tomcat src/main/resources/ /opt/frank/resources/
+COPY --chown=tomcat src/test/testtool/ /opt/frank/testtool/
+
+# Compile custom class, this should be changed to a buildstep in the future
+COPY --chown=tomcat src/main/java /tmp/java
+RUN javac /tmp/java/nl/nn/adapterframework/parameters/Parameter.java \
+     -classpath "/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/*:/usr/local/tomcat/lib/*" \
+     -verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
+RUN rm -rf /tmp/java
+
+HEALTHCHECK --interval=15s --timeout=5s --start-period=30s --retries=60 \
+  CMD curl --fail --silent http://localhost:8080/iaf/api/server/health || (curl --silent http://localhost:8080/iaf/api/server/health && exit 1)

build.xml

@@ -1,10 +1,16 @@
 <project default="restart-zaakbrug">
-	<target name="restart-zaakbrug">
-		<basename property="project.dir" file="${basedir}"/>
-		<exec executable="../frank-runner/restart.bat" vmlauncher="false" failonerror="true">
-			<arg value="-Dproject.dir=${project.dir}"/>
-			<arg value="-Dlog.level=WARN"/>
-			<arg value="-Dignore.double.jars=true"/>
-		</exec>
-	</target>
+    <target name="restart-zaakbrug">
+        <basename property="project.dir" file="${basedir}"/>
+        <condition property="exe" value="../frank-runner/restart.bat" else="/bin/bash">
+            <os family="windows"/>
+        </condition>
+        <condition property="arg" value="../frank-runner/restart.sh" else="">
+            <os family="unix"/>
+        </condition>
+        <exec executable="${exe}" vmlauncher="false" failonerror="true">
+            <arg value="${arg}"/>
+            <arg value="-Dprojects.dir=${basedir}/.."/>
+            <arg value="-Dproject.dir=${project.dir}"/>
+        </exec>
+    </target>
 </project>

docker-compose.yml

@@ -1,31 +1,65 @@
-version: "4"
+# This is a compose file inteded for trying out the project locally and absolutely
+# not suitable for production usage. The configuration here contains non-safe defaults.
+#
+# If you want to try out CMIS with Alfresco, see docker-compose.alfresco.yml
+#
+#       
+#     command: postgres -c max_connections=300 -c log_min_messages=LOG -c log_statement=all
+version: '4'
 
 services:
-  frank:
-    image: nexus.frankframework.org/frank-framework:latest
+  postgis:
+    image: mdillon/postgis
+    environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
-      - ./docker/context.xml:/usr/local/tomcat/conf/context.xml:ro
-      - ./src/main/resources/:/opt/frank/resources/:ro
-      - ./src/test/testtool/:/opt/frank/testtool/:ro
-      - ./src/main/configurations/:/opt/frank/configurations/:ro
+      - ./docker/postgres.entrypoint-initdb.d:/docker-entrypoint-initdb.d:ro
+      - database-data:/var/lib/postgresql/data
     ports:
-      - "8080:8080"
-    environment:
-      - SET_PERMISSIONS_ON_STARTUP=FALSE
-      - dtap.stage=LOC
-      - instance.name=Frank2ZGW
-      - database.instance.name=frank2zgw
-      - database.host=database
-      - database.name=database
-      - database/username=database_user
-      - database/password=database_password
-    depends_on:
-      - frankdatabase
-  frankdatabase:
-    image: "postgres"
+      - "11234:5432"
+
+  redis:
+    image: redis
+
+  open-zaak:
+    image: openzaak/open-zaak:latest
+    environment: &app-env
+      - DJANGO_SETTINGS_MODULE=openzaak.conf.docker
+      - SECRET_KEY=${SECRET_KEY:-7(h1r2hk)8z9+05edulo_3qzymwbo&c24=)qz7+_@3&2sp=u%i}
+      - DB_NAME=openzaak
+      - DB_USER=openzaak
+      - DB_HOST=postgis
+      - IS_HTTPS=no
+      - ALLOWED_HOSTS=*
+      - CACHE_DEFAULT=redis:6379/0
+      - CACHE_AXES=redis:6379/0
+      - SUBPATH=${SUBPATH:-/}
+      - OPENZAAK_SUPERUSER_USERNAME=admin
+      - DJANGO_SUPERUSER_PASSWORD=admin
+      - OPENZAAK_SUPERUSER_EMAIL=admin@localhost
+      - CELERY_BROKER_URL=redis://redis:6379/1
+      - CELERY_RESULT_BACKEND=redis://redis:6379/1
+      - CELERY_LOGLEVEL=DEBUG
+      - CELERY_WORKER_CONCURRENCY=${CELERY_WORKER_CONCURRENCY:-4}
     ports:
-      - "5432:5432"
+      - 8000:8000
+    volumes: &app-volumes
+      - media:/app/media  # Shared media volume to get access to saved OAS files
+      - private-media:/app/private-media
+    depends_on:
+      - postgis
+      - redis
+
+  zaakbrug:
+    build: .
+    image: zaakbrug
+    container_name: zaakbrug
     environment:
-      - POSTGRES_USER=database_user
-      - POSTGRES_PASSWORD=database_password
-      - POSTGRES_DB=database
+      - zgw.baseurl=http://open-zaak:8000/
+    ports:
+      - 8080:8080
+
+volumes:
+  database-data:
+  media:
+  private-media:

pom.xml

@@ -1,23 +1 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.ibissource</groupId>
-  <artifactId>withCustom</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>withCustom</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ibissource</groupId>
-      <artifactId>ibis-adapterframework-core</artifactId>
-      <version>7.6-20200518.212846</version>
-    </dependency>
-  </dependencies>
-</project>
+<!-- This empty pom is to tell the Frank!Runner this project uses the Maven structure -->