Add midPoint to the composition

Also cleaned up g-data a bit.

grouper-midpoint/README.md

@@ -1,20 +1,20 @@
 # Overview
 
-This is a demonstration of midPoint - Grouper integration. It is a work in progress.                                  
+This is a demonstration of midPoint - Grouper integration. It is a work in progress.
 
 It is derived from [TIER Grouper composition](https://github.internet2.edu/docker/grouper/tree/master/test-compose).
 
 In contrary to the original idea, the midPoint -> Grouper connection is realized via intermediate LDAP repository. This allows for better isolation, easier diagnostics and troubleshooting.
 
 There are the following containers:
 
-- `g-data`: the Grouper repository (MySQL)
-- `g-ui`, `g-daemon`, `g-ws`: containers fulfilling various Grouper roles
-- `mp-data`: midPoint repository (MySQL)
-- `mp-server`: midPoint application (GUI, REST, tasks, etc) (in the future this might be split into containers for distinct roles)
-- `i-data`: intermediate LDAP repository for communication from midPoint to Grouper
-- `idp`: Shibboleth identity provider
 - `s-data`: source data (LDAP & MySQL), simulating systems of record
+- `m-server`: midPoint application (GUI, REST, tasks, etc); it reads from `s-data`, updates its own repository and pushes data to Grouper via `i-data`
+- `m-data`: midPoint repository (MySQL)
+- `i-data`: intermediate repository for communication from midPoint to Grouper (LDAP)
+- `g-ui`, `g-daemon`, `g-ws`: Grouper containers
+- `g-data`: the Grouper repository (MySQL)
+- `idp`: Shibboleth identity provider; it uses `i-data` as the auhentication source
 
 All files needed to build and compose these containers are in `mp-gr` directory.
 

grouper-midpoint/mp-gr/configs-and-secrets/midpoint/database_password.txt

@@ -0,0 +1 @@
+456654

grouper-midpoint/mp-gr/docker-compose.yml

@@ -191,6 +191,33 @@ services:
      - source_mysql:/var/lib/mysql
      - source_ldap:/var/lib/dirsrv
 
+  m-data:
+    build: ./m-data/
+    expose:
+     - "3306"
+    ports:
+     - "23306:3306"
+    networks:
+     - back
+    volumes:
+     - midpoint_mysql:/var/lib/mysql
+
+  m-server:
+    build: ./m-server/
+    depends_on:
+      - m-data
+    expose:
+      - 8080
+    ports:
+      - 8080:8080
+    volumes:
+      - midpoint_home:/opt/midpoint/var
+    networks:
+      - front
+      - back
+    secrets:
+      - m_database_password.txt
+
   idp:
     build: ./idp/
     depends_on:
@@ -240,15 +267,14 @@ secrets:
     file: ./configs-and-secrets/grouper/subject.properties
   sp-key.pem:
     file: ./configs-and-secrets/shibboleth/sp-key.pem
+  m_database_password.txt:
+    file: ./configs-and-secrets/midpoint/database_password.txt
 
 
 volumes:
   grouper_mysql:
-    driver: local
   source_mysql:
-    driver: local
   source_ldap:
-    driver: local
   intermediate_ldap:
-    driver: local
-
+  midpoint_mysql:
+  midpoint_home:

grouper-midpoint/mp-gr/g-data/Dockerfile

@@ -1,16 +1,16 @@
 FROM tier/grouper:latest
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
-
-COPY container_files/seed-data/ /seed-data/
-COPY container_files/conf/ /opt/grouper/grouper.apiBinary/conf/
 
 RUN yum install -y epel-release \
     && yum update -y \
     && yum install -y mariadb-server mariadb \
     && yum clean all \
     && rm -rf /var/cache/yum
 
+#COPY container_files/seed-data/ /seed-data/
+COPY container_files/conf/ /opt/grouper/grouper.apiBinary/conf/
+
 RUN mysql_install_db \
     && chown -R mysql:mysql /var/lib/mysql/ \
     && sed -i 's/^\(bind-address\s.*\)/# \1/' /etc/my.cnf \
@@ -28,8 +28,7 @@ RUN mysql_install_db \
 
 RUN (mysqld_safe & ) \
     && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 1; done; \
-    bin/gsh -registry -check -runscript -noprompt \
-    && bin/gsh /seed-data/bootstrap.gsh
+    bin/gsh -registry -check -runscript -noprompt
 
 EXPOSE 3306