From 665928078ec30ee39f9e64ea5495d0330460f469 Mon Sep 17 00:00:00 2001 From: Alexandru-Eusebiu Epure Date: Wed, 25 Apr 2018 16:38:02 +0300 Subject: [PATCH] REPO-3457 : Remove /docker-compose (#39) * REPO-3457 : Remove /docker-compose Add test.env to /docker-alfresco/test/ Add share image, repository is on debug by default, remove references to docker.io, add REPOSITORY variable for repository images on quay.io. --- docker-alfresco/test/.env | 6 +- docker-alfresco/test/docker-compose.yml | 25 ++++++-- .../test}/test.env | 3 +- docker-compose/.env | 4 -- docker-compose/docker-compose.yml | 59 ------------------- 5 files changed, 28 insertions(+), 69 deletions(-) rename {docker-compose => docker-alfresco/test}/test.env (65%) delete mode 100644 docker-compose/.env delete mode 100644 docker-compose/docker-compose.yml diff --git a/docker-alfresco/test/.env b/docker-alfresco/test/.env index 2256ab425e..e814763dc9 100644 --- a/docker-alfresco/test/.env +++ b/docker-alfresco/test/.env @@ -1 +1,5 @@ -ALFRESCO_TAG=latest \ No newline at end of file +ALFRESCO_TAG=latest +SHARE_TAG=6.0.a +SOLR6_TAG=1.1.1 +POSTGRES_TAG=10.1 +REGISTRY= \ No newline at end of file diff --git a/docker-alfresco/test/docker-compose.yml b/docker-alfresco/test/docker-compose.yml index 54aaec709c..244407c35c 100644 --- a/docker-alfresco/test/docker-compose.yml +++ b/docker-alfresco/test/docker-compose.yml @@ -1,9 +1,17 @@ version: "3" +# The acs-community-deployment project contains the product version of docker-compose. +# +# This version is for testing and development use. For testing and debug we need to have a more open version. +# For remote debug we need the CATALINA_OPTS and to expose port 8000. + services: alfresco: - image: quay.io/alfresco/alfresco-content-repository-community:${ALFRESCO_TAG} + image: ${REGISTRY}alfresco/alfresco-content-repository-community:${ALFRESCO_TAG} environment: + CATALINA_OPTS : " + -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n + " JAVA_OPTS : " -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco @@ -22,14 +30,23 @@ services: -Dcifs.enabled=true " ports: - - 8080:8080 + - 8082:8080 + - 8000:8000 - 445:445 - 143:143 - "21:21" - "30000-30099:30000-30099" + share: + image: alfresco/alfresco-share:${SHARE_TAG} + environment: + - REPO_HOST=alfresco + - REPO_PORT=8080 + ports: + - 8080:8080 + postgres: - image: docker.io/library/postgres:10.1 + image: library/postgres:${POSTGRES_TAG} environment: - POSTGRES_PASSWORD=alfresco - POSTGRES_USER=alfresco @@ -38,7 +55,7 @@ services: - 5432:5432 solr6: - image: quay.io/alfresco/search-services:1.2.0-SNAPSHOT + image: alfresco/alfresco-search-services:${SOLR6_TAG} environment: #Solr needs to know how to register itself with Alfresco - SOLR_ALFRESCO_HOST=alfresco diff --git a/docker-compose/test.env b/docker-alfresco/test/test.env similarity index 65% rename from docker-compose/test.env rename to docker-alfresco/test/test.env index dd08ee4e82..c49cb67479 100644 --- a/docker-compose/test.env +++ b/docker-alfresco/test/test.env @@ -1,4 +1,5 @@ export ALFRESCO_TAG=latest export SHARE_TAG=6.0.a -export SOLR6_TAG=1.1.0 +export SOLR6_TAG=1.1.1 export POSTGRES_TAG=10.1 +export REGISTRY= \ No newline at end of file diff --git a/docker-compose/.env b/docker-compose/.env deleted file mode 100644 index 2cd025971c..0000000000 --- a/docker-compose/.env +++ /dev/null @@ -1,4 +0,0 @@ -ALFRESCO_TAG=6.0.4-ea -SHARE_TAG=6.0.a -SOLR6_TAG=1.1.0 -POSTGRES_TAG=10.1 diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml deleted file mode 100644 index a33bf5e6cb..0000000000 --- a/docker-compose/docker-compose.yml +++ /dev/null @@ -1,59 +0,0 @@ -version: "3" - -# The acs-community-deployment project contains the product version of docker-compose. -# -# This version is for testing and development use. For testing and debug we need to have a more open version. -# For remote debug we need the CATALINA_OPTS and to expose port 8000. - -services: - alfresco: - image: alfresco/alfresco-content-repository-community:${ALFRESCO_TAG} - environment: - CATALINA_OPTS : " - -agentlib:jdwp=transport=dt_socket,address=8000,server=y,suspend=n - " - 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 - " - ports: - - 8082:8080 #Browser port - - 8000:8000 #Debug port - - share: - image: alfresco/alfresco-share:${SHARE_TAG} - environment: - - REPO_HOST=alfresco - - REPO_PORT=8080 - ports: - - 8080:8080 - - postgres: - image: postgres:${POSTGRES_TAG} - environment: - - POSTGRES_PASSWORD=alfresco - - POSTGRES_USER=alfresco - - POSTGRES_DB=alfresco - ports: - - 5432:5432 - - solr6: - image: alfresco/alfresco-search-services:${SOLR6_TAG} - 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 - ports: - - 8083:8983 #Browser port