From 34d78e2a978446a913fa67b89c94738288be1e28 Mon Sep 17 00:00:00 2001
From: Paul <paul.vangenuchten@geocat.net>
Date: Wed, 6 Jan 2021 00:56:51 +0100
Subject: [PATCH] adds 3.11.snapshot + initial keycloak configuration

---
 master/Dockerfile                   | 19 ++++++++++++
 master/keycloak/Dockerfile          | 21 +++++++++++++
 master/keycloak/config-security.xml | 46 +++++++++++++++++++++++++++++
 master/keycloak/docker-compose.yml  | 35 ++++++++++++++++++++++
 4 files changed, 121 insertions(+)
 create mode 100644 master/Dockerfile
 create mode 100644 master/keycloak/Dockerfile
 create mode 100644 master/keycloak/config-security.xml
 create mode 100644 master/keycloak/docker-compose.yml

diff --git a/master/Dockerfile b/master/Dockerfile
new file mode 100644
index 0000000..d4d929e
--- /dev/null
+++ b/master/Dockerfile
@@ -0,0 +1,19 @@
+FROM tomcat:8.5-jre8
+
+MAINTAINER pvangenuchten <paul@geocat.net>
+
+WORKDIR $CATALINA_HOME/webapps
+
+ENV GN_FILE geonetwork-3.11.0-SNAPSHOT-2021-01-04.war
+
+RUN mv $CATALINA_HOME/webapps/ROOT $CATALINA_HOME/webapps/TOMCAT && \
+    mkdir $CATALINA_HOME/webapps/ROOT && \ 
+    cd $CATALINA_HOME/webapps/ROOT && \
+    curl -fSL -o geonetwork.war \
+    http://nightlybuild.geonetwork-opensource.org/master/${GN_FILE} && \
+    unzip -q geonetwork.war && \
+    rm geonetwork.war
+
+CMD ["catalina.sh", "run"]
+
+
diff --git a/master/keycloak/Dockerfile b/master/keycloak/Dockerfile
new file mode 100644
index 0000000..b4e074f
--- /dev/null
+++ b/master/keycloak/Dockerfile
@@ -0,0 +1,21 @@
+FROM tomcat:8.5-jre8
+
+MAINTAINER pvangenuchten <paul@geocat.net>
+
+WORKDIR $CATALINA_HOME/webapps
+
+ENV GN_FILE geonetwork-3.11.0-SNAPSHOT-2021-01-04.war
+
+RUN mv $CATALINA_HOME/webapps/ROOT $CATALINA_HOME/webapps/TOMCAT && \
+    mkdir $CATALINA_HOME/webapps/ROOT && \ 
+    cd $CATALINA_HOME/webapps/ROOT && \
+    curl -fSL -o geonetwork.war \
+    http://nightlybuild.geonetwork-opensource.org/master/${GN_FILE} && \
+    unzip -q geonetwork.war && \
+    rm geonetwork.war
+
+COPY ./config-security.xml $CATALINA_HOME/webapps/ROOT/WEB-INF
+
+CMD ["catalina.sh", "run"]
+
+
diff --git a/master/keycloak/config-security.xml b/master/keycloak/config-security.xml
new file mode 100644
index 0000000..973c27a
--- /dev/null
+++ b/master/keycloak/config-security.xml
@@ -0,0 +1,46 @@
+<!--
+  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
+  ~ and United Nations Environment Programme (UNEP)
+  ~
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or (at
+  ~ your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  ~
+  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+  ~ Rome - Italy. email: geonetwork@osgeo.org
+  -->
+
+<beans
+  xmlns:ctx="http://www.springframework.org/schema/context"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans
+          http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+          http://www.springframework.org/schema/context
+          http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+  xmlns="http://www.springframework.org/schema/beans">
+  <!-- <sec:debug/> -->
+  <import resource="config-security-core.xml"/>
+  <import resource="config-security-mapping.xml"/>
+  <import resource="config-security-keycloak.xml"/>
+  <!--<import resource="config-security-ldap.xml"/>-->
+  <!--<import resource="config-security-ldap-recursive.xml"/>-->
+  <!-- <import resource="config-security-ecas.xml"/> -->
+  <!--<import resource="config-security-cas.xml"/>-->
+  <!--<import resource="config-security-cas-ldap.xml"/>-->
+  <!-- <import resource="config-security-cas-database.xml"/> -->
+  <!-- <import resource="config-security-shibboleth.xml"/>  -->
+  <ctx:property-placeholder location="WEB-INF/config-security/config-security.properties"
+                            file-encoding="UTF-8" ignore-unresolvable="true" order="100"/>
+
+</beans>
diff --git a/master/keycloak/docker-compose.yml b/master/keycloak/docker-compose.yml
new file mode 100644
index 0000000..505682b
--- /dev/null
+++ b/master/keycloak/docker-compose.yml
@@ -0,0 +1,35 @@
+version: '3.1'
+
+volumes:
+  geonetwork:
+  keycloak:
+
+services:
+  
+  geonetwork:
+    image: geonetwork:3.11.SNAPSHOT
+    restart: always
+    ports:
+      - 443:8443
+    environment:
+      DATA_DIR: '/catalogue-data'
+      KEYCLOAK_AUTH_SERVER_URL: 'http://192.168.99.102:82/auth'
+      KEYCLOAK_REALM: 'myrealm'
+      KEYCLOAK_RESOURCE: 'myclient'
+      KEYCLOAK_SECRET: 'mysecret'
+      KEYCLOAK_DISABLE_TRUST_MANAGER: 'true'
+      JAVA_OPTS: >
+        -Dgeonetwork.data.dir=/catalogue-data
+    volumes:
+      - geonetwork:/catalogue-data
+
+  keycloak:
+    image: quay.io/keycloak/keycloak:12.0.1
+    restart: always
+    ports:
+      - 82:8080
+    environment:
+      KEYCLOAK_USER: 'admin'
+      KEYCLOAK_PASSWORD: 'admin'
+    volumes:
+      - keycloak:/data
\ No newline at end of file