solr fix and images renamed

Author: shahmanash

docker-compose.yml

@@ -30,13 +30,13 @@ services:
       - db_data_collectory:/var/lib/mysql
 
   cassandradb:
-    image: dina/ala-cassandra:v0.1
+    image: bioatlas/ala-cassandra:v0.1
     container_name: cassandradb
     volumes:
       - db_data_cassandra:/var/lib/cassandra
 
   biocacheservice:
-    image: dina/ala-biocacheservice:v0.1
+    image: bioatlas/ala-biocacheservice:v0.1
     container_name: biocacheservice
     depends_on:
       - cassandradb
@@ -48,7 +48,7 @@ services:
       JAVA_OPTS: -Xmx8g -Xms8g -XX:MaxPermSize=256m -Xss256k -Djava.awt.headless=true
 
   biocachehub:
-    image: dina/ala-biocachehub:v0.1
+    image: bioatlas/ala-biocachehub:v0.1
     container_name: biocachehub
     depends_on:
       - biocacheservice
@@ -58,7 +58,7 @@ services:
       - ./config/generic-hub-config.properties:/data/generic-hub/config/generic-hub-config.properties
 
   collectory:
-    image: dina/ala-collectory:v0.1
+    image: bioatlas/ala-collectory:v0.1
     container_name: collectory
     depends_on:
       - mysqldb
@@ -72,7 +72,7 @@ services:
     command: /bin/ash -c "envsubst < /tmp/generic-collectory-config.properties > /data/generic-collectory/config/generic-collectory-config.properties && catalina.sh run"
 
   webserver:
-    image: dina/ala-nginx:v0.1
+    image: bioatlas/ala-nginx:v0.1
     container_name: webserver
     environment:
       - VIRTUAL_HOST=bioatlas.se,uptime.bioatlas.se
@@ -88,14 +88,14 @@ services:
       - ./env/.htpasswd:/etc/nginx/htpasswd
 
   nameindex:
-    image: dina/ala-nameindex:v0.1
+    image: bioatlas/ala-nameindex:v0.1
     command: /bin/ash
     container_name: nameindex
     volumes:
       - data_nameindex:/data/lucene/namematching
 
   biocachebackend:
-    image: dina/ala-biocachebackend:v0.1
+    image: bioatlas/ala-biocachebackend:v0.1
     container_name: biocachebackend
     links:
       - biocachehub
@@ -111,13 +111,15 @@ services:
       - data_biocachebackend:/data
 
   solr:
-    image: dina/ala-solrindex:v0.1
+    image: bioatlas/ala-solrindex:v0.1
     container_name: solr
     environment:
       SOLR_HEAP: 16g
+    volumes:
+      - data_solr:/data/solr
 
   mongo:
-    image: dina/ala-mongo:v0.1
+    image: bioatlas/ala-mongo:v0.1
     #image: mvertes/alpine-mongo
     container_name: mongo
     volumes:
@@ -165,7 +167,7 @@ services:
   #    - 172.17.0.1:53:53/udp
 
   loggerservice:
-    image: dina/ala-loggerservice:v0.1
+    image: bioatlas/ala-loggerservice:v0.1
     container_name: loggerservice
     depends_on:
       - mysqldblogger
@@ -187,7 +189,7 @@ services:
       - db_data_loggerservice:/var/lib/mysql
 
   imageservice:
-    image: dina/ala-imageservice:v0.1
+    image: bioatlas/ala-imageservice:v0.1
     container_name: imageservice
     depends_on:
       - psqldbimage
@@ -208,7 +210,7 @@ services:
     container_name: static
 
   imagestore:
-    image: dina/ala-imagestore:v0.1
+    image: bioatlas/ala-imagestore:v0.1
     volumes:
       - data_images:/data/images/store
     container_name: imagestore
@@ -221,7 +223,7 @@ services:
       - db_data_imageservice:/var/lib/postgresql/data
 
   apiservice:
-    image: dina/ala-api:v0.1
+    image: bioatlas/ala-api:v0.1
     container_name: apiservice
     depends_on:
       - mysqldbapi
@@ -242,7 +244,7 @@ services:
       - db_data_apiservice:/var/lib/mysql
 
   dashboard:
-    image: dina/ala-dashboard:v0.1
+    image: bioatlas/ala-dashboard:v0.1
     container_name: dashboard
     environment:
       JAVA_OPTS: -Xmx4g -Xms4g -XX:MaxPermSize=256m -Xss256k -Djava.awt.headless=true
@@ -271,3 +273,4 @@ volumes:
   data_images:
   data_biocachebackend:
   data_mirroreum:
+  data_solr:

solr4/Dockerfile

@@ -51,6 +51,7 @@ ENV PATH /opt/solr/bin:/opt/docker-solr/scripts:$PATH
 EXPOSE 8983
 WORKDIR /opt/solr
 USER $SOLR_USER
+VOLUME /opt/solr
 
 ENTRYPOINT ["tini", "--", "docker-entrypoint.sh"]
-CMD ["solr"]
+CMD ["solr"]