From 505f8e24dd5bd163f96fa093d3151a1dad7cae21 Mon Sep 17 00:00:00 2001 From: Joeri Bekker Date: Wed, 3 Mar 2021 10:41:47 +0100 Subject: [PATCH] :wrench: Initial test setup for Alfresco 6.2 --- .github/workflows/ci.yml | 5 +- README.rst | 5 +- ...ompose.yml => docker-compose-6.1.2-ga.yml} | 0 alfresco/docker-compose-6.2.0-ga.yml | 104 ++++++++++++++++++ 4 files changed, 110 insertions(+), 4 deletions(-) rename alfresco/{docker-compose.yml => docker-compose-6.1.2-ga.yml} (100%) create mode 100644 alfresco/docker-compose-6.2.0-ga.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f73bc5..42ccf3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,13 +17,14 @@ jobs: matrix: python: ['3.7', '3.8'] django: ['2.2'] + alfresco: ['6.1.2-ga', '6.2.0-ga'] binding: ['BROWSER', 'WEBSERVICE'] cmisurlmapping: [ 'False', 'True' ] exclude: - binding: 'BROWSER' cmisurlmapping: 'True' - name: Tests (Py${{ matrix.python }}, Django ${{ matrix.django }}, ${{ matrix.binding }}, URL mapping = ${{ matrix.cmisurlmapping }}) + name: Tests (Py${{ matrix.python }}, Django ${{ matrix.django }}, Alfresco ${{ matrix.alfresco }}, ${{ matrix.binding }}, URL mapping = ${{ matrix.cmisurlmapping }}) steps: - uses: actions/checkout@v2 @@ -32,7 +33,7 @@ jobs: python-version: ${{ matrix.python }} - name: Bring up Alfresco - run: cd alfresco && docker-compose up -d + run: cd alfresco && docker-compose -f docker-compose-${{ matrix.alfresco }}.yml up -d - name: Install dependencies run: pip install tox tox-travis codecov diff --git a/README.rst b/README.rst index 01ca812..3120e33 100644 --- a/README.rst +++ b/README.rst @@ -57,12 +57,13 @@ Tested against: * `Corsa platform`_ using CMIS 1.0 Web Services binding (Thanks to `BCT`_) * `Alfresco`_ Enterprise 5.2.3 using CMIS 1.1 Browser binding (Thanks to `Contezza`_) -* `Alfresco CE 6.1.2-ga`_ (Used for CI) +* `Alfresco CE`_ 6.1.2-ga and 6.2.0-ga using CMIS 1.1 Browser binding (Used for + CI) .. _`Corsa platform`: https://www.bctsoftware.com/corsa/ .. _`BCT`: https://www.bctsoftware.com/ .. _`Contezza`: https://contezza.nl/ -.. _`Alfresco CE 6.1.2-ga`: https://hub.docker.com/layers/alfresco/alfresco-content-repository-community/6.1.2-ga/images/sha256-6edaf25aded1b16991f06be7754a7030c9d67429353e39ce1da3fd307a5f2e6f?context=explore +.. _`Alfresco CE`: https://hub.docker.com/r/alfresco/alfresco-content-repository-community/tags?page=1&ordering=last_updated&name=-ga Installation diff --git a/alfresco/docker-compose.yml b/alfresco/docker-compose-6.1.2-ga.yml similarity index 100% rename from alfresco/docker-compose.yml rename to alfresco/docker-compose-6.1.2-ga.yml diff --git a/alfresco/docker-compose-6.2.0-ga.yml b/alfresco/docker-compose-6.2.0-ga.yml new file mode 100644 index 0000000..ba208be --- /dev/null +++ b/alfresco/docker-compose-6.2.0-ga.yml @@ -0,0 +1,104 @@ +# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose +version: "2" + +services: + alfresco: + image: alfresco/alfresco-content-repository-community:6.2.0-ga + mem_limit: 3g + 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.baseUrl=/solr + -Dindex.subsystem.name=solr6 + -Dalfresco.host=localhost + -Dalfresco.port=8082 + + -Dshare.host=localhost + -Dshare.port=8082 + + -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos + -Dmessaging.broker.url="failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true" + -Ddeployment.method=DOCKER_COMPOSE + -Dcsrf.filter.enabled=false + -Xms2g -Xmx2g + " + volumes: + - ./volumes/data/alf-repo-data:/usr/local/tomcat/alf_data + - ./volumes/logs/alfresco:/usr/local/tomcat/logs + - ./extension:/usr/local/tomcat/shared/classes/alfresco/extension + - ./config/alfresco-global.properties:/usr/local/tomcat/shared/classes/alfresco-global.properties + ports: + - 8082:8080 #Browser port + share: + image: alfresco/alfresco-share:6.2.0 + mem_limit: 1g + environment: + - REPO_HOST: "alfresco" + - REPO_PORT: "8080" + - CSRF_FILTER_REFERER: "http://localhost/.*" + - CSRF_FILTER_ORIGIN: "http://localhost" + - JAVA_OPTS: " + -Xms976m -Xmx976m + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " + volumes: + - ./volumes/logs/share:/usr/local/tomcat/logs + ports: + - 8080:8080 + + postgres: + image: postgres:11.4 + mem_limit: 1104m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: " + postgres + -c max_connections=200 + -c log_min_messages=LOG" + volumes: + - ./volumes/data/postgres-data:/var/lib/postgresql/data + # - ./volumes/logs/postgres:/var/log/postgresql + ports: + - 5434:5432 + + solr6: + image: alfresco/alfresco-search-services:2.0.1 + mem_limit: 2208m + 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" + - SOLR_JAVA_MEM: "-Xms1952m -Xmx1952m" + - SOLR_OPTS: " + -XX:NewSize=848m + -XX:MaxNewSize=848m + " + # volumes: + # - ./data/solr-data:/opt/alfresco-search-services/data + ports: + - 8083:8983 #Browser port + + activemq: + image: alfresco/alfresco-activemq:5.15.8 + mem_limit: 1g + ports: + - 8161:8161 # Web Console + - 5673:5672 # AMQP + - 61616:61616 # OpenWire + - 61613:61613 # STOMP