Oracle jdk support (#9)

* Updated sub-modules to head. * Setup named volumes * Updated tags to default to open-jdk.
islandora-deprecated · May 22, 2016 · d41f27f · d41f27f
1 parent e6246cc
commit d41f27f
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 23 deletions.
diff --git a/example.docker-compose.yml b/example.docker-compose.yml
@@ -1,4 +1,11 @@
 version: "2"
+volumes:
+  blazegraph:
+  drupal:
+  fedora:
+  karaf:
+  mariadb:
+  solr:
 services:
 
   # Un-comment to enable etcd as the back end for storing environment variables.
@@ -26,40 +33,42 @@ services:
   mariadb:
     image: islandora/claw-mariadb
     env_file: env_files/mariadb.env
+    volumes:
+      - "mariadb:/var/lib/mysql"
     ports:
       - "3306:3306"
 
   fedora:
-    image: islandora/claw-fedora
+    image: islandora/claw-fedora:open-jdk
     env_file: env_files/fedora.env
     volumes:
-      - "/mvn/fedora-data"
+      - "fedora:/mvn/fedora-data"
     ports:
       - "8080:8080"
 
   blazegraph:
-    image: islandora/claw-blazegraph
+    image: islandora/claw-blazegraph:open-jdk
     env_file: env_files/blazegraph.env
     volumes:
-      - "/opt/blazegraph"
+      - "blazegraph:/opt/blazegraph"
     ports:
       - "8081:8080"
 
   solr:
-    image: islandora/claw-solr
+    image: islandora/claw-solr:open-jdk
     env_file: env_files/solr.env
     volumes:
-      - "/opt/solr/collection1/data"
+      - "solr:/opt/solr/collection1/data"
     ports:
       - "8082:8080"
 
   karaf:
-    image: islandora/claw-islandora-karaf-components
+    image: islandora/claw-islandora-karaf-components:open-jdk
     env_file:
       - env_files/karaf.env
       - env_files/drupal.env
     volumes:
-      - "/opt/karaf/data"
+      - "karaf:/opt/karaf/data"
     ports:
       - "8181:8181"
 
@@ -69,7 +78,7 @@ services:
       - env_files/drupal.env
       - env_files/mariadb.env
     volumes:
-      -  "/var/www/localhost/htdocs/sites/default/files"
+      -  "drupal:/var/www/localhost/htdocs/sites/default/files"
     ports:
       - "80:80"
     links:

diff --git a/images/all-in-one b/images/all-in-one
diff --git a/images/base b/images/base
diff --git a/images/blazegraph b/images/blazegraph
diff --git a/images/drupal b/images/drupal
diff --git a/images/fedora b/images/fedora
diff --git a/images/islandora b/images/islandora
diff --git a/images/islandora-karaf-components b/images/islandora-karaf-components
diff --git a/images/karaf b/images/karaf
diff --git a/images/mariadb b/images/mariadb
diff --git a/images/maven b/images/maven
diff --git a/images/open-jdk b/images/open-jdk
diff --git a/images/oracle-jdk b/images/oracle-jdk
diff --git a/images/solr b/images/solr
diff --git a/images/tomcat b/images/tomcat