From d41f27f9cc44708961ddc8d7b937dfaede064299 Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Sun, 22 May 2016 14:03:04 +0100 Subject: [PATCH] Oracle jdk support (#9) * Updated sub-modules to head. * Setup named volumes * Updated tags to default to open-jdk. --- example.docker-compose.yml | 27 ++++++++++++++++++--------- images/all-in-one | 2 +- images/base | 2 +- images/blazegraph | 2 +- images/drupal | 2 +- images/fedora | 2 +- images/islandora | 2 +- images/islandora-karaf-components | 2 +- images/karaf | 2 +- images/mariadb | 2 +- images/maven | 2 +- images/open-jdk | 2 +- images/oracle-jdk | 2 +- images/solr | 2 +- images/tomcat | 2 +- 15 files changed, 32 insertions(+), 23 deletions(-) diff --git a/example.docker-compose.yml b/example.docker-compose.yml index 603a7b7..31b8bf3 100644 --- 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 index b118a40..eebd4b1 160000 --- a/images/all-in-one +++ b/images/all-in-one @@ -1 +1 @@ -Subproject commit b118a402650f42fa39a04ca2923b35dd9126468f +Subproject commit eebd4b16bab4354de4d8531b54769c43eef17e49 diff --git a/images/base b/images/base index d946982..ff3367b 160000 --- a/images/base +++ b/images/base @@ -1 +1 @@ -Subproject commit d9469827edbc2be2c80e2707061c9ea0f736d76d +Subproject commit ff3367b246caa3fea87592556427051d2e2b2ed6 diff --git a/images/blazegraph b/images/blazegraph index 27de972..0590bac 160000 --- a/images/blazegraph +++ b/images/blazegraph @@ -1 +1 @@ -Subproject commit 27de9721b376f7cf07fd1a9bdaa3f415ebbf9edb +Subproject commit 0590bac21024c827f5abb81d9d46dea8b9d0e997 diff --git a/images/drupal b/images/drupal index d7e7b75..ce68241 160000 --- a/images/drupal +++ b/images/drupal @@ -1 +1 @@ -Subproject commit d7e7b75dbd74e2ad2171f29917af4bfdb058385b +Subproject commit ce6824144dd8cc2cd156c1c885a5eb837c921a87 diff --git a/images/fedora b/images/fedora index 76162a8..e6b9f40 160000 --- a/images/fedora +++ b/images/fedora @@ -1 +1 @@ -Subproject commit 76162a892e378bf1fdb924a54d4e600dd5708403 +Subproject commit e6b9f4070a9617813c2404ee8098eb4b2d539cfc diff --git a/images/islandora b/images/islandora index d5a1477..8be7d16 160000 --- a/images/islandora +++ b/images/islandora @@ -1 +1 @@ -Subproject commit d5a1477c51a3df21098d8c870357ce1d5b8b7924 +Subproject commit 8be7d160865062d460498b848f470981fcc6ef7f diff --git a/images/islandora-karaf-components b/images/islandora-karaf-components index ea2ab34..c569a74 160000 --- a/images/islandora-karaf-components +++ b/images/islandora-karaf-components @@ -1 +1 @@ -Subproject commit ea2ab34970dc0ddeb73aecce68109f971362582e +Subproject commit c569a741d90a6ae234fc7b54e7032b031c824ded diff --git a/images/karaf b/images/karaf index 07b222e..d658b03 160000 --- a/images/karaf +++ b/images/karaf @@ -1 +1 @@ -Subproject commit 07b222e3d26229f552488c0bb0b5a1eeac95f441 +Subproject commit d658b030989f998cb3c35e1ed24367f18165073b diff --git a/images/mariadb b/images/mariadb index 728a12d..4dd8a98 160000 --- a/images/mariadb +++ b/images/mariadb @@ -1 +1 @@ -Subproject commit 728a12d225d977540f5d5734c27b6952338f1f76 +Subproject commit 4dd8a9862c8d2ad28f2d7e6fdad1a13a53950f80 diff --git a/images/maven b/images/maven index 56fc827..ff9a55c 160000 --- a/images/maven +++ b/images/maven @@ -1 +1 @@ -Subproject commit 56fc827b9faf89acbcf097720f80513f4b25d701 +Subproject commit ff9a55c66328e38c977591a035998c3fadedce6c diff --git a/images/open-jdk b/images/open-jdk index 59b1e65..f2c4e49 160000 --- a/images/open-jdk +++ b/images/open-jdk @@ -1 +1 @@ -Subproject commit 59b1e656be6fb1199caf5995dc4b2f99e948f07e +Subproject commit f2c4e496b0e5f6c1f4cb0101d3caea5ee2bc7295 diff --git a/images/oracle-jdk b/images/oracle-jdk index cfcbae5..dac8a04 160000 --- a/images/oracle-jdk +++ b/images/oracle-jdk @@ -1 +1 @@ -Subproject commit cfcbae529ffcccca12a1e6fbebe558b9c8226b2e +Subproject commit dac8a0454b0c880f7ad7ec76e7288b0ba609367c diff --git a/images/solr b/images/solr index 13a7549..bd9bc91 160000 --- a/images/solr +++ b/images/solr @@ -1 +1 @@ -Subproject commit 13a7549fa655ed0746ccd9fbcdd469986f20e170 +Subproject commit bd9bc91f58548082bcb15e3bebd61bfdb8fb4454 diff --git a/images/tomcat b/images/tomcat index 9042487..6a10eb6 160000 --- a/images/tomcat +++ b/images/tomcat @@ -1 +1 @@ -Subproject commit 9042487a2c57b6999d6f12b4eaece4b400b80208 +Subproject commit 6a10eb62dd05b7ae3c0dca9323b6d2b18672f61d