Unverified Commit e42f539f authored by Alex Mukha's avatar Alex Mukha
Browse files

REPO-5711 Fix repository to Search services comms 

The Search Services is now using anew default "secret" communication method.
The changes also have updates to the latest Search Services version (2.0.3)
parent 42e57263

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

+5 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ services: 
    environment:

      JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"

      JAVA_OPTS: "

        -Dsolr.secureComms=secret

        -Dsolr.sharedSecret=secret

        -Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"

        "

      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
@@ -43,13 +45,15 @@ services: 
    volumes:

      - ${rootArtifactId}-db-volume:/var/lib/postgresql/data

  ${rootArtifactId}-ass:

    image: alfresco/alfresco-search-services:1.2.0

    image: alfresco/alfresco-search-services:2.0.3

    environment:

      SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs

      SOLR_ALFRESCO_PORT: 8080

      SOLR_SOLR_HOST: ${rootArtifactId}-ass

      SOLR_SOLR_PORT: 8983

      SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive

      ALFRESCO_SECURE_COMMS: "secret"

      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"

    ports:

      - "8983:8983"

    volumes:

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

+5 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ services: 
    environment:

      JAVA_TOOL_OPTIONS: "${symbol_dollar}{keystore.settings}"

      JAVA_OPTS: "

        -Dsolr.secureComms=secret

        -Dsolr.sharedSecret=secret

        -Dmessaging.broker.url=\"failover:(nio://${rootArtifactId}-activemq:61616)?timeout=3000&jms.useCompression=true\"

        "

      CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888"
@@ -39,13 +41,15 @@ services: 
    volumes:

      - ${rootArtifactId}-db-volume:/var/lib/postgresql/data

  ${rootArtifactId}-ass:

    image: alfresco/alfresco-search-services:1.2.0

    image: alfresco/alfresco-search-services:2.0.3

    environment:

      SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs

      SOLR_ALFRESCO_PORT: 8080

      SOLR_SOLR_HOST: ${rootArtifactId}-ass

      SOLR_SOLR_PORT: 8983

      SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive

      ALFRESCO_SECURE_COMMS: "secret"

      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"

    ports:

      - "8983:8983"

    volumes:

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

+5 −2
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ services: 
#                -Ddb.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco

#                -Dsolr.host=${rootArtifactId}-ass

#                -Dsolr.port=8983

#                -Dsolr.secureComms=none

#                -Dsolr.secureComms=secret

#                -Dsolr.sharedSecret=secret

#                -Dsolr.base.url=/solr

#                -Dindex.subsystem.name=solr6

#                -Dcsrf.filter.enabled=false
@@ -52,13 +53,15 @@ services: 
#    volumes:

#      - ${rootArtifactId}-db-volume:/var/lib/postgresql/data

#  ${rootArtifactId}-ass:

#    image: alfresco/alfresco-search-services:1.2.0

#    image: alfresco/alfresco-search-services:2.0.3

#    environment:

#      SOLR_ALFRESCO_HOST: ${rootArtifactId}-acs

#      SOLR_ALFRESCO_PORT: 8080

#      SOLR_SOLR_HOST: ${rootArtifactId}-ass

#      SOLR_SOLR_PORT: 8983

#      SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive

#      ALFRESCO_SECURE_COMMS: "secret"

#      JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret"

#    ports:

#      - "8983:8983"

#    volumes:

docs/working-with-generated-projects/working-with-aio.md

+54 −57
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ Then check the name of the ACS Repository container: 
$ docker container ls

CONTAINER ID        IMAGE                                                         COMMAND                  CREATED             STATUS              PORTS                                                      NAMES

733867a70117        alfresco-content-services-my-all-in-one-project:development   "catalina.sh run -se…"   5 minutes ago       Up 5 minutes        0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp             docker_my-all-in-one-project-acs_1

1f197e52b4f2        alfresco/alfresco-search-services:1.2.0                       "/bin/sh -c '$DIST_D…"   5 minutes ago       Up 5 minutes        0.0.0.0:8983->8983/tcp                                     docker_my-all-in-one-project-ass_1

1f197e52b4f2        alfresco/alfresco-search-services:2.0.3                       "/bin/sh -c '$DIST_D…"   5 minutes ago       Up 5 minutes        0.0.0.0:8983->8983/tcp                                     docker_my-all-in-one-project-ass_1

4eff0cc9cc25        alfresco-share-my-all-in-one-project:development              "/usr/local/tomcat/s…"   5 minutes ago       Up 5 minutes        8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp   docker_my-all-in-one-project-share_1

a7854ff16d72        postgres:9.6                                                  "docker-entrypoint.s…"   5 minutes ago       Up 5 minutes        0.0.0.0:5555->5432/tcp                                     docker_my-all-in-one-project-postgres_1

```
@@ -233,7 +233,7 @@ $ docker container ls 
CONTAINER ID        IMAGE                                                         COMMAND                  CREATED             STATUS              PORTS                                                      NAMES

49015432f1b2        alfresco-content-services-my-all-in-one-project:development   "catalina.sh run -se…"   20 minutes ago      Up 20 minutes       0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp             docker_my-all-in-one-project-acs_1

edb9ea129a5d        postgres:9.6                                                  "docker-entrypoint.s…"   20 minutes ago      Up 20 minutes       0.0.0.0:5555->5432/tcp                                     docker_my-all-in-one-project-postgres_1

6992d183986f        alfresco/alfresco-search-services:1.2.0                       "/bin/sh -c '$DIST_D…"   20 minutes ago      Up 20 minutes       0.0.0.0:8983->8983/tcp                                     docker_my-all-in-one-project-ass_1

6992d183986f        alfresco/alfresco-search-services:2.0.3                       "/bin/sh -c '$DIST_D…"   20 minutes ago      Up 20 minutes       0.0.0.0:8983->8983/tcp                                     docker_my-all-in-one-project-ass_1

107d00733efd        alfresco-share-my-all-in-one-project:development              "/usr/local/tomcat/s…"   20 minutes ago      Up 20 minutes       8000/tcp, 0.0.0.0:8180->8080/tcp, 0.0.0.0:9898->8888/tcp   docker_my-all-in-one-project-share_1

```
@@ -251,6 +251,3 @@ Removing docker_my-all-in-one-project-ass_1 ... done 
Removing docker_my-all-in-one-project-share_1    ... done

Removing network docker_default

```

docs/working-with-generated-projects/working-with-platform.md

+48 −51
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ Then check the name of the ACS Repository container: 
$ docker container ls

CONTAINER ID        IMAGE                                                       COMMAND                  CREATED             STATUS              PORTS                                            NAMES

ba90b1648470        alfresco-content-services-my-platform-project:development   "catalina.sh run -se…"   8 minutes ago       Up 8 minutes        0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp   docker_my-platform-project-acs_1

0435b09e687c        alfresco/alfresco-search-services:1.2.0                     "/bin/sh -c '$DIST_D…"   8 minutes ago       Up 8 minutes        0.0.0.0:8983->8983/tcp                           docker_my-platform-project-ass_1

0435b09e687c        alfresco/alfresco-search-services:2.0.3                     "/bin/sh -c '$DIST_D…"   8 minutes ago       Up 8 minutes        0.0.0.0:8983->8983/tcp                           docker_my-platform-project-ass_1

c9145e7cdb20        postgres:9.6                                                "docker-entrypoint.s…"   8 minutes ago       Up 8 minutes        0.0.0.0:5555->5432/tcp                           docker_my-platform-project-postgres_1

```
@@ -220,7 +220,7 @@ as they run in daemon mode in the background. Check this by executing the follow 
$ docker container ls

CONTAINER ID        IMAGE                                                       COMMAND                  CREATED             STATUS              PORTS                                            NAMES

61de829092f3        alfresco-content-services-my-platform-project:development   "catalina.sh run -se…"   3 minutes ago       Up 3 minutes        0.0.0.0:8080->8080/tcp, 0.0.0.0:8888->8888/tcp   docker_my-platform-project-acs_1

07300ddb6714        alfresco/alfresco-search-services:1.2.0                     "/bin/sh -c '$DIST_D…"   3 minutes ago       Up 3 minutes        0.0.0.0:8983->8983/tcp                           docker_my-platform-project-ass_1

07300ddb6714        alfresco/alfresco-search-services:2.0.3                     "/bin/sh -c '$DIST_D…"   3 minutes ago       Up 3 minutes        0.0.0.0:8983->8983/tcp                           docker_my-platform-project-ass_1

09922ce36d90        postgres:9.6                                                "docker-entrypoint.s…"   3 minutes ago       Up 3 minutes        0.0.0.0:5555->5432/tcp                           docker_my-platform-project-postgres_1

```
@@ -236,6 +236,3 @@ Removing docker_my-platform-project-ass_1 ... done 
Removing docker_my-platform-project-postgres_1 ... done

Removing network docker_default

```