Merge pull request #132 from Islandora-Devops/post-sprint-4

Pushing init logic into Make.  Focusing on 'demo', 'local', and (not q…

docker-compose.crayfish.yml

@@ -2,9 +2,10 @@ version: "3.7"
 networks:
   default:
     internal: true
+  gateway:
+    external:
+      name: gateway
 services:
-  gemini:
-    image: ${REPOSITORY:-islandora}/gemini:${TAG:-latest}
   homarus:
     image: ${REPOSITORY:-islandora}/homarus:${TAG:-latest}
   houdini:
@@ -13,5 +14,10 @@ services:
     image: ${REPOSITORY:-islandora}/hypercube:${TAG:-latest}
   milliner:
     image: ${REPOSITORY:-islandora}/milliner:${TAG:-latest}
+    environment:
+      MILLINER_FEDORA6: ${FEDORA_6}
+    networks:
+      default:
+      gateway:
   recast:
     image: ${REPOSITORY:-islandora}/recast:${TAG:-latest}

docker-compose.drupal.yml

@@ -31,3 +31,4 @@ services:
       - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-drupal_https.tls=true
     networks:
       default:
+      gateway:

docker-compose.fcrepo.mariadb.yml

@@ -4,5 +4,5 @@ services:
   fcrepo:
     environment:
       FCREPO_PERSISTENCE_TYPE: mysql
-      FCREPO_DB_HOST: mariadb
-      FCREPO_DB_PORT: 3306
+      FCREPO_DB_MYSQL_HOST: mariadb
+      FCREPO_DB_MYSQL_PORT: 3306

docker-compose.fcrepo.postgresql.yml

@@ -4,5 +4,5 @@ services:
   fcrepo:
     environment:
       FCREPO_PERSISTENCE_TYPE: postgresql
-      FCREPO_DB_HOST: postgresql
-      FCREPO_DB_PORT: 5432
+      FCREPO_DB_POSTGRESQL_HOST: postgresql
+      FCREPO_DB_POSTGRESQL_PORT: 5432

docker-compose.fcrepo.yml

@@ -12,6 +12,9 @@ services:
     image: ${REPOSITORY:-islandora}/fcrepo:${TAG:-latest}
     environment:
       FCREPO_ALLOW_EXTERNAL_DRUPAL: http://${DOMAIN}/
+      FCREPO_TOMCAT_ADMIN_ROLES: manager-gui,fedoraAdmin
+      FCREPO_TOMCAT_ADMIN_USER: admin 
+      FCREPO_DISABLE_SYN: ${DISABLE_SYN}
     volumes:
       - fcrepo-data:/data
     depends_on:

docker-compose.fcrepo6.mariadb.yml

@@ -0,0 +1,9 @@
+version: "3.7"
+services:
+  # Override defaults so Mariadb is used as the database for this service.
+  fcrepo:
+    environment:
+      FCREPO_PERSISTENCE_TYPE: mariadb
+      FCREPO_DB_MYSQL_HOST: mariadb
+      FCREPO_DB_MYSQL_PORT: 3306
+      FCREPO_DB_NAME: fcrepo

docker-compose.fcrepo6.postgresql.yml

@@ -0,0 +1,9 @@
+version: "3.7"
+services:
+  # Override defaults so PostgreSQL is used as the database for this service.
+  fcrepo:
+    environment:
+      FCREPO_PERSISTENCE_TYPE: postgresql
+      FCREPO_DB_POSTGRESQL_HOST: postgresql
+      FCREPO_DB_POSTGRESQL_PORT: 5432
+      FCREPO_DB_NAME: fcrepo

docker-compose.fcrepo6.yml

@@ -0,0 +1,29 @@
+version: "3.7"
+networks:
+  default:
+    internal: true
+  gateway:
+    external:
+      name: gateway
+volumes:
+  fcrepo-data:
+services:
+  fcrepo:
+    image: ${REPOSITORY:-islandora}/fcrepo6:${TAG:-latest}
+    environment:
+      FCREPO_ALLOW_EXTERNAL_DRUPAL: http://${DOMAIN}/
+      FCREPO_TOMCAT_ADMIN_ROLES: manager-gui,fedoraAdmin
+      FCREPO_TOMCAT_ADMIN_USER: admin 
+      FCREPO_DISABLE_SYN: ${DISABLE_SYN}
+    volumes:
+      - fcrepo-data:/data
+    depends_on:
+      - activemq
+    networks:
+      default:
+    labels:
+      # Do not expose in production.
+      - traefik.enable=true
+      - traefik.http.services.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo.loadbalancer.server.port=80
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo_http.service=${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo
+      - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-fcrepo_http.entrypoints=fcrepo

docker-compose.secrets.yml

@@ -10,6 +10,8 @@ secrets:
     file: "./secrets/ALPACA_KARAF_ADMIN_PASSWORD"
   DRUPAL_DEFAULT_ACCOUNT_PASSWORD:
     file: "./secrets/DRUPAL_DEFAULT_ACCOUNT_PASSWORD"
+  DRUPAL_DEFAULT_CONFIGDIR:
+    file: "./secrets/DRUPAL_DEFAULT_CONFIGDIR"
   DRUPAL_DEFAULT_DB_PASSWORD:
     file: "./secrets/DRUPAL_DEFAULT_DB_PASSWORD"
   DRUPAL_DEFAULT_DB_ROOT_PASSWORD:
@@ -28,14 +30,6 @@ secrets:
     file: "./secrets/JWT_ADMIN_TOKEN"
   FCREPO_JWT_PUBLIC_KEY:
     file: "./secrets/JWT_PUBLIC_KEY"
-  GEMINI_DB_PASSWORD:
-    file: "./secrets/GEMINI_DB_PASSWORD"
-  GEMINI_DB_ROOT_PASSWORD:
-    file: "./secrets/GEMINI_DB_ROOT_PASSWORD"
-  GEMINI_JWT_ADMIN_TOKEN:
-    file: "./secrets/JWT_ADMIN_TOKEN"
-  GEMINI_JWT_PUBLIC_KEY:
-    file: "./secrets/JWT_PUBLIC_KEY"
   HOMARUS_JWT_ADMIN_TOKEN:
     file: "./secrets/JWT_ADMIN_TOKEN"
   HOMARUS_JWT_PUBLIC_KEY:
@@ -64,8 +58,8 @@ secrets:
     file: "./secrets/JWT_ADMIN_TOKEN"
   RECAST_JWT_PUBLIC_KEY:
     file: "./secrets/JWT_PUBLIC_KEY"
-  DRUPAL_DEFAULT_CONFIGDIR:
-    file: "./secrets/DRUPAL_DEFAULT_CONFIGDIR"
+  TOMCAT_ADMIN_PASSWORD:
+    file: "./secrets/TOMCAT_ADMIN_PASSWORD"
 services:
   activemq:
     secrets:
@@ -75,6 +69,9 @@ services:
     secrets:
       - ALPACA_ACTIVEMQ_PASSWORD
       - ALPACA_KARAF_ADMIN_PASSWORD
+  cantaloupe:
+    secrets:
+      - TOMCAT_ADMIN_PASSWORD
   drupal:
     secrets:
       - DRUPAL_DEFAULT_ACCOUNT_PASSWORD
@@ -90,12 +87,7 @@ services:
       - FCREPO_DB_ROOT_PASSWORD
       - FCREPO_JWT_ADMIN_TOKEN
       - FCREPO_JWT_PUBLIC_KEY
-  gemini:
-    secrets:
-      - GEMINI_DB_PASSWORD
-      - GEMINI_DB_ROOT_PASSWORD
-      - GEMINI_JWT_ADMIN_TOKEN
-      - GEMINI_JWT_PUBLIC_KEY
+      - TOMCAT_ADMIN_PASSWORD
   homarus:
     secrets:
       - HOMARUS_JWT_ADMIN_TOKEN

sample.env

@@ -12,7 +12,7 @@ ENVIRONMENT=demo
 
 # Enable this to generate a docker-compose file that uses secrets.
 # If you're running staging, CI, or production, set to true.
-USE_SECRETS=true
+USE_SECRETS=false
 
 ###############################################################################
 # Environment variables specific to composer.
@@ -57,10 +57,12 @@ REPOSITORY=islandora
 
 # The version of the isle-buildkit images, non isle-buildkit images have
 # their versions specified explicitly in their respective docker-compose files.
-TAG=25a016543cc324980f53e071120c39904b7619a1
+TAG=b6f7e4e8b91c56db2a1b78b2513aa40bfb034a16
 
 ###############################################################################
 # Global Environment variables
 ###############################################################################
 
 DOMAIN=islandora.traefik.me
+DISABLE_SYN=false
+FEDORA_6=true

secrets/TOMCAT_ADMIN_PASSWORD

@@ -0,0 +1 @@
+password