From 30bf5f03da41d53168c60b564a87a3acbf315665 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denys.vuika@gmail.com>
Date: Tue, 16 Oct 2018 14:31:15 +0100
Subject: [PATCH] upgrade docker images (#724)

---
 docker-compose.yml | 182 ++++++++++++++++++++++++---------------------
 1 file changed, 96 insertions(+), 86 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 88b9d750a..e48454677 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,95 +1,105 @@
-version: "3"
+version: '3'
 
 services:
-    alfresco:
-        image: alfresco/alfresco-content-repository-community:6.0.7-ga
-        depends_on:
-            - postgres
-        environment:
-            JAVA_OPTS : "
-                -Ddb.driver=org.postgresql.Driver
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-                -Dsolr.host=solr6
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
-                -Dsolr.base.url=/solr
-                -Dindex.subsystem.name=solr6
-                -Dshare.host=localhost
-                -Ddeployment.method=DOCKER_COMPOSE
-                -Dcsrf.filter.enabled=false
-                "
-        networks:
-            - internal
-        ports:
-            - 8080:8080 #Browser port
+  alfresco:
+    image: alfresco/alfresco-content-repository-community:6.1.0-ea
+    depends_on:
+      - postgres
+    environment:
+      JAVA_OPTS: '
+        -Ddb.driver=org.postgresql.Driver
+        -Ddb.username=alfresco
+        -Ddb.password=alfresco
+        -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
+        -Dsolr.host=solr6
+        -Dsolr.port=8983
+        -Dsolr.secureComms=none
+        -Dsolr.base.url=/solr
+        -Dindex.subsystem.name=solr6
+        -Dshare.host=localhost
+        -Ddeployment.method=DOCKER_COMPOSE
+        -Dcsrf.filter.enabled=false
+        '
+    networks:
+      - internal
+    ports:
+      - 8080:8080 #Browser port
 
-    share:
-        image: alfresco/alfresco-share:6.0.b
-        depends_on:
-            - alfresco
-        environment:
-            - REPO_HOST=alfresco
-            - REPO_PORT=8080
-        networks:
-            - internal
-        ports:
-            - 8083:8080
+  share:
+    image: alfresco/alfresco-share:6.0.c
+    depends_on:
+      - alfresco
+    environment:
+      - REPO_HOST=alfresco
+      - REPO_PORT=8080
+    networks:
+      - internal
+    ports:
+      - 8083:8080
 
-    postgres:
-        image: postgres:10.1
-        environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-        networks:
-            - internal
-        ports:
-            - 5432:5432
+  postgres:
+    image: postgres:10.1
+    environment:
+      - POSTGRES_PASSWORD=alfresco
+      - POSTGRES_USER=alfresco
+      - POSTGRES_DB=alfresco
+    command: postgres -c max_connections=300 -c log_min_messages=LOG
+    networks:
+      - internal
+    ports:
+      - 5432:5432
 
-    solr6:
-        image: alfresco/alfresco-search-services:1.1.1
-        depends_on:
-            - alfresco
-        environment:
-            #Solr needs to know how to register itself with Alfresco
-            - SOLR_ALFRESCO_HOST=alfresco
-            - SOLR_ALFRESCO_PORT=8080
-            #Alfresco needs to know how to call solr
-            - SOLR_SOLR_HOST=solr6
-            - SOLR_SOLR_PORT=8983
-            #Create the default alfresco and archive cores
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-        networks:
-            - internal
-        ports:
-            - 8983:8983 #Browser port
+  solr6:
+    image: alfresco/alfresco-search-services:1.2.0
+    depends_on:
+      - alfresco
+    environment:
+      #Solr needs to know how to register itself with Alfresco
+      - SOLR_ALFRESCO_HOST=alfresco
+      - SOLR_ALFRESCO_PORT=8080
+      #Alfresco needs to know how to call solr
+      - SOLR_SOLR_HOST=solr6
+      - SOLR_SOLR_PORT=8983
+      #Create the default alfresco and archive cores
+      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+    networks:
+      - internal
+    ports:
+      - 8983:8983 #Browser port
 
-    content-app:
-        image: alfresco/alfresco-content-app:latest
-        build: .
-        depends_on:
-            - alfresco
-        networks:
-            - internal
-        ports:
-            - 4001:80
-        # volumes:
-        #     - ./app.config.json:/usr/share/nginx/html/app.config.json
-        #     - ./nginx.conf:/etc/nginx/conf.d/default.conf
+  activemq:
+    image: alfresco/alfresco-activemq:5.15.6
+    networks:
+      - internal
+    ports:
+      - 8161:8161 # Web Console
+      - 5672:5672 # AMQP
+      - 61616:61616 # OpenWire
+      - 61613:61613 # STOMP
 
-    proxy:
-        image: nginx:stable-alpine
-        depends_on:
-          - content-app
-        volumes:
-          - ./docker-compose/nginx.conf:/etc/nginx/conf.d/default.conf
-        networks:
-          - internal
-        ports:
-          - 4000:80
+  content-app:
+    image: alfresco/alfresco-content-app:latest
+    build: .
+    depends_on:
+      - alfresco
+    networks:
+      - internal
+    ports:
+      - 4001:80
+    # volumes:
+    #     - ./app.config.json:/usr/share/nginx/html/app.config.json
+    #     - ./nginx.conf:/etc/nginx/conf.d/default.conf
+
+  proxy:
+    image: nginx:stable-alpine
+    depends_on:
+      - content-app
+    volumes:
+      - ./docker-compose/nginx.conf:/etc/nginx/conf.d/default.conf
+    networks:
+      - internal
+    ports:
+      - 4000:80
 
 networks:
-    internal:
+  ? internal