From d3f7530333fea2cd2b042aa59b61dad7a8ca3809 Mon Sep 17 00:00:00 2001 From: Marcello Teodori <151025+mteodori@users.noreply.github.com> Date: Thu, 2 Dec 2021 18:22:13 +0000 Subject: [PATCH] OPSEXP-1120 update versions for 5.2.0-M1 (#626) * OPSEXP-1120 update versions for 5.2.0-M1 * update docker compose share image * fix chart version * set postgres to 13.3 as per support matrix and update nginx to SSL * fix repo community version in compose * update common chart to M16 * upgrade postgresql helm chart * update share in community compose * add separate 7.1 config * use ingress template and remove leftover vars * use always default for ooiService * align nginx and adw for compose * revert ingress as it requires extra changes * fix image location * fix pdf-renderer --- .checkov-ignore-list | 2 +- .pre-commit-config.yaml | 20 + .pre-commit-hooks.yaml | 2 +- .travis.yml | 8 + CONTRIBUTING.md | 2 +- LICENSE | 2 +- README.md | 23 +- docker-compose/6.1.N-docker-compose.yml | 399 ++++++----- docker-compose/6.2.N-docker-compose.yml | 333 +++++----- docker-compose/7.0.N-docker-compose.yml | 343 +++++----- docker-compose/7.1.N-docker-compose.yml | 185 ++++++ docker-compose/README.md | 2 +- docker-compose/community-docker-compose.yml | 210 +++--- docker-compose/docker-compose.yml | 346 +++++----- docs/docker-compose/README.md | 4 +- .../6.1.N_values.yaml | 592 +---------------- .../6.2.N_values.yaml | 629 +----------------- .../7.0.N_values.yaml | 27 +- .../7.1.N_values.yaml | 50 ++ helm/alfresco-content-services/Chart.yaml | 8 +- helm/alfresco-content-services/README.md | 30 +- .../templates/svc-activemq-web-console.yaml | 2 +- .../templates/_helpers.tpl | 2 +- .../alfresco-search/templates/NOTES.txt | 2 +- .../alfresco-search/templates/_helpers.tpl | 2 +- .../alfresco-search/templates/config.yaml | 2 +- .../alfresco-search/templates/secrets.yaml | 2 +- .../alfresco-search/templates/service.yaml | 2 +- .../charts/alfresco-sync-service/README.md | 1 - .../charts/alfresco-sync-service/values.yaml | 3 - .../community_values.yaml | 386 ----------- .../templates/_helpers-ai-transformer.tpl | 1 - .../templates/config-filestore.yaml | 2 +- .../templates/config-transform-misc.yaml | 2 +- .../templates/deployment-share.yaml | 1 - .../templates/deployment-transform-misc.yaml | 2 +- .../deployment-transform-router.yaml | 2 +- .../templates/ingress-ooi-service.yaml | 2 + .../templates/svc-filestore.yaml | 2 +- .../templates/svc-transform-misc.yaml | 2 +- .../templates/svc-transform-router.yaml | 2 +- helm/alfresco-content-services/values.yaml | 43 +- .../acs-test-docker-compose-collection.json | 2 +- .../helm/acs-test-helm-collection.json | 2 +- .../helm/acs-validate-volume-collection.json | 2 +- 45 files changed, 1176 insertions(+), 2512 deletions(-) create mode 100644 docker-compose/7.1.N-docker-compose.yml create mode 100644 helm/alfresco-content-services/7.1.N_values.yaml diff --git a/.checkov-ignore-list b/.checkov-ignore-list index 6edff026e..05aee8f41 100644 --- a/.checkov-ignore-list +++ b/.checkov-ignore-list @@ -1 +1 @@ -CKV_K8S_21,CKV_K8S_20,CKV_K8S_43,CKV_K8S_35,CKV_K8S_31,CKV_K8S_22,CKV_K8S_11,CKV_K8S_10,CKV_K8S_29,CKV_K8S_30,CKV_K8S_23,CKV_K8S_28,CKV_K8S_37,CKV_K8S_38,CKV_K8S_40,CKV_K8S_15 \ No newline at end of file +CKV_K8S_21,CKV_K8S_20,CKV_K8S_43,CKV_K8S_35,CKV_K8S_31,CKV_K8S_22,CKV_K8S_11,CKV_K8S_10,CKV_K8S_29,CKV_K8S_30,CKV_K8S_23,CKV_K8S_28,CKV_K8S_37,CKV_K8S_38,CKV_K8S_40,CKV_K8S_15 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fde20e825..d4b410fbc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,26 @@ repos: - id: travis-yml-lint - id: helm-deps - id: helm-lint + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.0.1 + hooks: + - id: check-yaml + args: [--allow-multiple-documents] + exclude: helm/.*/templates + - id: check-json + - id: check-merge-conflict + - id: fix-byte-order-marker + - id: mixed-line-ending + args: ['--fix=lf'] + - id: end-of-file-fixer + - repo: https://github.com/IamTheFij/docker-pre-commit + rev: v2.0.1 + hooks: + - id: docker-compose-check + - repo: https://github.com/sirosen/check-jsonschema + rev: 0.5.1 + hooks: + - id: check-travis - repo: https://github.com/Alfresco/acs-deployment rev: v5.1.0-M2 hooks: diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml index 9b6398e40..33d0c1dce 100644 --- a/.pre-commit-hooks.yaml +++ b/.pre-commit-hooks.yaml @@ -2,4 +2,4 @@ name: Checkov - Helm check entry: bash -c "helm template helm/alfresco-content-services --set \"alfresco-search.alfresco-insight-zeppelin.insightzeppelin.enabled\"=true > helm/alfresco-content-services.yaml && checkov -f helm/alfresco-content-services.yaml --framework=kubernetes --skip-check $(cat .checkov-ignore-list) --quiet" language: system - pass_filenames: false \ No newline at end of file + pass_filenames: false diff --git a/.travis.yml b/.travis.yml index c28a7f442..57b9e90e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ stages: - name: lint - name: test - name: community + - name: 7.1.N - name: 7.0.N - name: 6.2.N - name: 6.1.N @@ -408,6 +409,13 @@ jobs: stage: community <<: *docker_deploy + - name: 7.1.N-helm + stage: 7.1.N + <<: *helm_deploy + - name: 7.1.N-compose + stage: 7.1.N + <<: *docker_deploy + - name: 7.0.N-helm stage: 7.0.N <<: *helm_deploy diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aee4d90b6..34cbb15c5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,4 +20,4 @@ Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1. available at [http://contributor-covenant.org/version/1/4][version] [homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ \ No newline at end of file +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/LICENSE b/LICENSE index ed08681f1..d51ddb886 100644 --- a/LICENSE +++ b/LICENSE @@ -188,4 +188,4 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file + limitations under the License. diff --git a/README.md b/README.md index a61bc682d..dc17678d6 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,17 @@ A new version numbering scheme is also being introduced, during the development The table below shows the exact version of ACS deployed with each chart version/tag. -| Chart Version/Tag | Default | 7.0.N | 6.2.N | 6.1.N | Community | -|--|--|--|--|--|--| -| 5.0.0-M1 | 7.0.0-M2 | | 6.2.2 | 6.1.1 | 6.2.1-A8 | -| 5.0.0-M2 | 7.0.0-M3 | | 6.2.2 | 6.1.1 | 7.0.0-A10 | -| 5.0.0 | 7.0.0 | | 6.2.2 | 6.1.1 | 7.0.0 | -| 5.0.1 | 7.0.0 | | 6.2.2 | 6.1.1 | 7.0.0 | -| 5.1.0-M1 | 7.1.0-M1 | | 6.2.2 | 6.1.1 | 7.1.0-M1 | -| 5.1.0-M2 | 7.1.0-M2 | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0-M2 | -| 5.1.0 | 7.1.0.1 | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0 | -| 5.1.1 | 7.1.0.1 | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0 | +| Chart Version/Tag | Default | 7.1.N | 7.0.N | 6.2.N | 6.1.N | Community | +|-------------------|----------|---------|-------|-------|-------|-----------| +| 5.0.0-M1 | 7.0.0-M2 | | | 6.2.2 | 6.1.1 | 6.2.1-A8 | +| 5.0.0-M2 | 7.0.0-M3 | | | 6.2.2 | 6.1.1 | 7.0.0-A10 | +| 5.0.0 | 7.0.0 | | | 6.2.2 | 6.1.1 | 7.0.0 | +| 5.0.1 | 7.0.0 | | | 6.2.2 | 6.1.1 | 7.0.0 | +| 5.1.0-M1 | 7.1.0-M1 | | | 6.2.2 | 6.1.1 | 7.1.0-M1 | +| 5.1.0-M2 | 7.1.0-M2 | | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0-M2 | +| 5.1.0 | 7.1.0.1 | | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0 | +| 5.1.1 | 7.1.0.1 | | 7.0.1 | 6.2.2 | 6.1.1 | 7.1.0 | +| 5.2.0-M1 | 7.2.0-M1 | 7.1.0.1 | 7.0.1 | 6.2.2 | 6.1.1 | 7.2.0-M1 | ### Docker @@ -52,7 +53,7 @@ By default the latest version of the chart will always deploy the latest develop NOTE: As the Helm chart no longer deploys a specific version of ACS the `appVersion` property within the chart is longer be specified. -Our tests are executed using Helm 3.2.4, kubectl 1.18.4 against an EKS cluster running Kubernetes 1.17. +Our tests are executed using Helm 3.5.4, kubectl 1.18.9 against an EKS cluster running Kubernetes 1.21. ## Getting Started diff --git a/docker-compose/6.1.N-docker-compose.yml b/docker-compose/6.1.N-docker-compose.yml index bb80cdf5e..03e3a3c69 100644 --- a/docker-compose/6.1.N-docker-compose.yml +++ b/docker-compose/6.1.N-docker-compose.yml @@ -12,205 +12,204 @@ version: "2" services: - alfresco: - image: alfresco/alfresco-content-repository:6.1.1 - mem_limit: 1700m - 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 - -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/ - -Djodconverter.url=http://libreoffice:8090/ - -Dimg.url=http://imagemagick:8090/ - -Dtika.url=http://tika:8090/ - -Dsfs.url=http://shared-file-store:8099/ - -Dshare.host=127.0.0.1 - -Dshare.port=8080 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos - -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" - -Ddeployment.method=DOCKER_COMPOSE - -Dlocal.transform.service.enabled=true - -Dtransform.service.enabled=true - -Dcsrf.filter.enabled=false - -Ddsync.service.uris=http://localhost:9090/alfresco - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " - - transform-router: - mem_limit: 512m - image: quay.io/alfresco/alfresco-transform-router:1.4.1 - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - IMAGEMAGICK_URL: "http://imagemagick:8090" - PDF_RENDERER_URL : "http://alfresco-pdf-renderer:8090" - LIBREOFFICE_URL : "http://libreoffice:8090" - TIKA_URL : "http://tika:8090" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - links: - - activemq - - alfresco-pdf-renderer: - image: quay.io/alfresco/alfresco-pdf-renderer:2.0.17 - mem_limit: 1g - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8090:8090 - links: - - activemq - - imagemagick: - image: quay.io/alfresco/alfresco-imagemagick:2.0.17 - mem_limit: 1g - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8091:8090 - links: - - activemq - - libreoffice: - image: quay.io/alfresco/alfresco-libreoffice:2.0.17 - mem_limit: 1g - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8092:8090 - links: - - activemq - - tika: - image: quay.io/alfresco/alfresco-tika:2.0.17 - mem_limit: 1g - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8093:8090 - links: - - activemq - - shared-file-store: - image: alfresco/alfresco-shared-file-store:0.5.3 - mem_limit: 512m - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - scheduler.content.age.millis: 86400000 - scheduler.cleanup.interval: 86400000 - ports: - - 8099:8099 - volumes: - - shared-file-store-volume:/tmp/Alfresco/sfs - - share: - image: alfresco/alfresco-share:6.1.1 - mem_limit: 1g - environment: - REPO_HOST: "alfresco" - REPO_PORT: "8080" - JAVA_OPTS: " - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Dalfresco.context=alfresco - -Dalfresco.protocol=http - " - - postgres: - image: postgres:11.4 - mem_limit: 512m - environment: - - POSTGRES_PASSWORD=alfresco - - POSTGRES_USER=alfresco - - POSTGRES_DB=alfresco - command: postgres -c max_connections=300 -c log_min_messages=LOG - ports: - - 5432:5432 - - solr6: - image: alfresco/alfresco-search-services:1.4.3 - mem_limit: 2g - 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 - #HTTP by default - - ALFRESCO_SECURE_COMMS=none - ports: - - 8083:8983 #Browser port - - activemq: - image: alfresco/alfresco-activemq:5.15.14 - mem_limit: 1g - ports: - - 8161:8161 # Web Console - - 5672:5672 # AMQP - - 61616:61616 # OpenWire - - 61613:61613 # STOMP - - digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:1.3.0 - mem_limit: 128m - environment: - BASEPATH: ./ - - proxy: - image: alfresco/alfresco-acs-nginx:3.1.1 - mem_limit: 128m - depends_on: - - alfresco - - digital-workspace - ports: - - 8080:8080 - links: - - digital-workspace - - alfresco - - share - - sync-service: - image: quay.io/alfresco/service-sync:3.1.2 - mem_limit: 1g - environment: - JAVA_OPTS : " - -Dsql.db.driver=org.postgresql.Driver - -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco - -Dsql.db.username=alfresco - -Dsql.db.password=alfresco - -Dmessaging.broker.host=activemq - -Drepo.hostname=alfresco - -Drepo.port=8080 - -Ddw.server.applicationConnectors[0].type=http - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " - - ports: - - 9090:9090 + alfresco: + image: alfresco/alfresco-content-repository:6.1.1 + mem_limit: 1700m + 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 + -Dalfresco-pdf-renderer.url=http://alfresco-pdf-renderer:8090/ + -Djodconverter.url=http://libreoffice:8090/ + -Dimg.url=http://imagemagick:8090/ + -Dtika.url=http://tika:8090/ + -Dsfs.url=http://shared-file-store:8099/ + -Dshare.host=127.0.0.1 + -Dshare.port=8080 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + -Dlocal.transform.service.enabled=true + -Dtransform.service.enabled=true + -Dcsrf.filter.enabled=false + -Ddsync.service.uris=http://localhost:9090/alfresco + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + + transform-router: + mem_limit: 512m + image: quay.io/alfresco/alfresco-transform-router:1.4.1 + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + IMAGEMAGICK_URL: "http://imagemagick:8090" + PDF_RENDERER_URL: "http://alfresco-pdf-renderer:8090" + LIBREOFFICE_URL: "http://libreoffice:8090" + TIKA_URL: "http://tika:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + links: + - activemq + + alfresco-pdf-renderer: + image: quay.io/alfresco/alfresco-pdf-renderer:2.0.17 + mem_limit: 1g + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8090:8090" + links: + - activemq + + imagemagick: + image: quay.io/alfresco/alfresco-imagemagick:2.0.17 + mem_limit: 1g + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8091:8090" + links: + - activemq + + libreoffice: + image: quay.io/alfresco/alfresco-libreoffice:2.0.17 + mem_limit: 1g + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8092:8090" + links: + - activemq + + tika: + image: quay.io/alfresco/alfresco-tika:2.0.17 + mem_limit: 1g + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8093:8090" + links: + - activemq + + shared-file-store: + image: alfresco/alfresco-shared-file-store:0.5.3 + mem_limit: 512m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + scheduler.content.age.millis: 86400000 + scheduler.cleanup.interval: 86400000 + ports: + - "8099:8099" + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + + share: + image: alfresco/alfresco-share:6.1.1 + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: " + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " + + postgres: + image: postgres:11.4 + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - "5432:5432" + + solr6: + image: alfresco/alfresco-search-services:1.4.3 + mem_limit: 2g + 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 + # HTTP by default + - ALFRESCO_SECURE_COMMS=none + ports: + - "8083:8983" # Browser port + + activemq: + image: alfresco/alfresco-activemq:5.15.14 + mem_limit: 1g + ports: + - "8161:8161" # Web Console + - "5672:5672" # AMQP + - "61616:61616" # OpenWire + - "61613:61613" # STOMP + + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:1.4.0 + mem_limit: 128m + environment: + BASEPATH: ./ + + proxy: + image: alfresco/alfresco-acs-nginx:3.2.0 + mem_limit: 128m + depends_on: + - alfresco + - digital-workspace + ports: + - "8080:8080" + links: + - digital-workspace + - alfresco + - share + + sync-service: + image: quay.io/alfresco/service-sync:3.1.2 + mem_limit: 1g + environment: + JAVA_OPTS: " + -Dsql.db.driver=org.postgresql.Driver + -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco + -Dsql.db.username=alfresco + -Dsql.db.password=alfresco + -Dmessaging.broker.host=activemq + -Drepo.hostname=alfresco + -Drepo.port=8080 + -Ddw.server.applicationConnectors[0].type=http + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + ports: + - "9090:9090" volumes: - shared-file-store-volume: - driver_opts: - type: tmpfs - device: tmpfs + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs diff --git a/docker-compose/6.2.N-docker-compose.yml b/docker-compose/6.2.N-docker-compose.yml index 201a62cad..6e7fd2b84 100644 --- a/docker-compose/6.2.N-docker-compose.yml +++ b/docker-compose/6.2.N-docker-compose.yml @@ -11,173 +11,170 @@ version: "2" services: - alfresco: - image: quay.io/alfresco/alfresco-content-repository:6.2.2 - mem_limit: 1700m - 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=127.0.0.1 - -Dshare.port=8080 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos - -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" - -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true - -Dtransform.service.url=http://transform-router:8095 - -Dsfs.url=http://shared-file-store:8099/ - -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ - -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ - -Djodconverter.url=http://transform-core-aio:8090/ - -Dimg.url=http://transform-core-aio:8090/ - -Dtika.url=http://transform-core-aio:8090/ - -Dtransform.misc.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false - -Ddsync.service.uris=http://localhost:9090/alfresco - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " - - transform-router: - mem_limit: 512m - image: quay.io/alfresco/alfresco-transform-router:1.4.1 - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - - CORE_AIO_URL : "http://transform-core-aio:8090" - - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8095:8095 - links: - - activemq - - transform-core-aio: - image: alfresco/alfresco-transform-core-aio:2.5.3 - mem_limit: 1536m - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8090:8090 - links: - - activemq - - shared-file-store: - image: quay.io/alfresco/alfresco-shared-file-store:0.16.0 - mem_limit: 512m - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - scheduler.content.age.millis: 86400000 - scheduler.cleanup.interval: 86400000 - ports: - - 8099:8099 - volumes: - - shared-file-store-volume:/tmp/Alfresco/sfs - - share: - image: alfresco/alfresco-share:6.2.2 - mem_limit: 1g - environment: - REPO_HOST: "alfresco" - REPO_PORT: "8080" - JAVA_OPTS: " - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Dalfresco.context=alfresco - -Dalfresco.protocol=http - " - - postgres: - image: postgres:11.4 - mem_limit: 512m - environment: - - POSTGRES_PASSWORD=alfresco - - POSTGRES_USER=alfresco - - POSTGRES_DB=alfresco - command: postgres -c max_connections=300 -c log_min_messages=LOG - ports: - - 5432:5432 - - solr6: - image: alfresco/alfresco-search-services:1.4.3 - mem_limit: 2g - 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 - #HTTP by default - - ALFRESCO_SECURE_COMMS=none - ports: - - 8083:8983 #Browser port - - activemq: - image: alfresco/alfresco-activemq:5.15.14 - mem_limit: 1g - ports: - - 8161:8161 # Web Console - - 5672:5672 # AMQP - - 61616:61616 # OpenWire - - 61613:61613 # STOMP - - digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:2.4.2-adw - mem_limit: 128m - environment: - APP_CONFIG_AUTH_TYPE: "BASIC" - BASE_PATH: ./ - - proxy: - image: alfresco/alfresco-acs-nginx:3.1.1 - mem_limit: 128m - depends_on: - - alfresco - - digital-workspace - ports: - - 8080:8080 - links: - - digital-workspace - - alfresco - - share - - sync-service: - image: quay.io/alfresco/service-sync:3.3.4.1 - mem_limit: 1g - environment: - JAVA_OPTS : " - -Dsql.db.driver=org.postgresql.Driver - -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco - -Dsql.db.username=alfresco - -Dsql.db.password=alfresco - -Dmessaging.broker.host=activemq - -Drepo.hostname=alfresco - -Drepo.port=8080 - -Ddw.server.applicationConnectors[0].type=http - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " - - ports: - - 9090:9090 + alfresco: + image: quay.io/alfresco/alfresco-content-repository:6.2.2 + mem_limit: 1700m + 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=127.0.0.1 + -Dshare.port=8080 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + -Dtransform.service.enabled=true + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ + -Djodconverter.url=http://transform-core-aio:8090/ + -Dimg.url=http://transform-core-aio:8090/ + -Dtika.url=http://transform-core-aio:8090/ + -Dtransform.misc.url=http://transform-core-aio:8090/ + -Dcsrf.filter.enabled=false + -Ddsync.service.uris=http://localhost:9090/alfresco + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + + transform-router: + mem_limit: 512m + image: quay.io/alfresco/alfresco-transform-router:1.4.1 + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL: "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8095:8095" + links: + - activemq + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.5.3 + mem_limit: 1536m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8090:8090" + links: + - activemq + + shared-file-store: + image: quay.io/alfresco/alfresco-shared-file-store:0.16.0 + mem_limit: 512m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + scheduler.content.age.millis: 86400000 + scheduler.cleanup.interval: 86400000 + ports: + - "8099:8099" + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + + share: + image: alfresco/alfresco-share:6.2.2 + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: " + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " + + postgres: + image: postgres:11.4 + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - "5432:5432" + + solr6: + image: alfresco/alfresco-search-services:1.4.3 + mem_limit: 2g + 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 + # HTTP by default + - ALFRESCO_SECURE_COMMS=none + ports: + - "8083:8983" # Browser port + + activemq: + image: alfresco/alfresco-activemq:5.15.14 + mem_limit: 1g + ports: + - "8161:8161" # Web Console + - "5672:5672" # AMQP + - "61616:61616" # OpenWire + - "61613:61613" # STOMP + + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:2.5.0 + mem_limit: 128m + environment: + APP_CONFIG_AUTH_TYPE: "BASIC" + BASE_PATH: ./ + + proxy: + image: alfresco/alfresco-acs-nginx:3.2.0 + mem_limit: 128m + depends_on: + - alfresco + - digital-workspace + ports: + - "8080:8080" + links: + - digital-workspace + - alfresco + - share + + sync-service: + image: quay.io/alfresco/service-sync:3.3.4.1 + mem_limit: 1g + environment: + JAVA_OPTS: " + -Dsql.db.driver=org.postgresql.Driver + -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco + -Dsql.db.username=alfresco + -Dsql.db.password=alfresco + -Dmessaging.broker.host=activemq + -Drepo.hostname=alfresco + -Drepo.port=8080 + -Ddw.server.applicationConnectors[0].type=http + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + ports: + - "9090:9090" volumes: - shared-file-store-volume: - driver_opts: - type: tmpfs - device: tmpfs + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs diff --git a/docker-compose/7.0.N-docker-compose.yml b/docker-compose/7.0.N-docker-compose.yml index 79b8e4b66..4989d2814 100644 --- a/docker-compose/7.0.N-docker-compose.yml +++ b/docker-compose/7.0.N-docker-compose.yml @@ -11,178 +11,175 @@ version: "2" services: - alfresco: - image: quay.io/alfresco/alfresco-content-repository:7.0.1 - mem_limit: 1700m - environment: - JAVA_TOOL_OPTIONS: " - -Dencryption.keystore.type=JCEKS - -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding - -Dencryption.keyAlgorithm=DESede - -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore - -Dmetadata-keystore.password=mp6yc0UD9e - -Dmetadata-keystore.aliases=metadata - -Dmetadata-keystore.metadata.password=oKIWzVdEdA - -Dmetadata-keystore.metadata.algorithm=DESede - " - 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=127.0.0.1 - -Dshare.port=8080 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos - -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" - -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true - -Dtransform.service.url=http://transform-router:8095 - -Dsfs.url=http://shared-file-store:8099/ - -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false - -Ddsync.service.uris=http://localhost:9090/alfresco - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " - - transform-router: - mem_limit: 512m - image: quay.io/alfresco/alfresco-transform-router:1.4.1 - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - - CORE_AIO_URL : "http://transform-core-aio:8090" - - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8095:8095 - links: - - activemq - - transform-core-aio: - image: alfresco/alfresco-transform-core-aio:2.5.3 - mem_limit: 1536m - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8090:8090 - links: - - activemq - - shared-file-store: - image: quay.io/alfresco/alfresco-shared-file-store:0.16.0 - mem_limit: 512m - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - scheduler.content.age.millis: 86400000 - scheduler.cleanup.interval: 86400000 - ports: - - 8099:8099 - volumes: - - shared-file-store-volume:/tmp/Alfresco/sfs - - share: - image: quay.io/alfresco/alfresco-share:7.0.1 - mem_limit: 1g - environment: - REPO_HOST: "alfresco" - REPO_PORT: "8080" - JAVA_OPTS: " - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Dalfresco.context=alfresco - -Dalfresco.protocol=http - " - - postgres: - image: postgres:13.1 - mem_limit: 512m - environment: - - POSTGRES_PASSWORD=alfresco - - POSTGRES_USER=alfresco - - POSTGRES_DB=alfresco - command: postgres -c max_connections=300 -c log_min_messages=LOG - ports: - - 5432:5432 - - solr6: - image: alfresco/alfresco-search-services:2.0.2 - mem_limit: 2g - 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 - #HTTP by default - - ALFRESCO_SECURE_COMMS=none - ports: - - 8083:8983 #Browser port - - activemq: - image: alfresco/alfresco-activemq:5.16.1 - mem_limit: 1g - ports: - - 8161:8161 # Web Console - - 5672:5672 # AMQP - - 61616:61616 # OpenWire - - 61613:61613 # STOMP - - digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:2.4.2-adw - mem_limit: 128m - environment: - APP_CONFIG_AUTH_TYPE: "BASIC" - BASE_PATH: ./ - - proxy: - image: alfresco/alfresco-acs-nginx:3.1.1 - mem_limit: 128m - depends_on: - - alfresco - - digital-workspace - ports: - - 8080:8080 - links: - - digital-workspace - - alfresco - - share - - sync-service: - image: quay.io/alfresco/service-sync:3.4.0 - mem_limit: 1g - environment: - JAVA_OPTS : " - -Dsql.db.driver=org.postgresql.Driver - -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco - -Dsql.db.username=alfresco - -Dsql.db.password=alfresco - -Dmessaging.broker.host=activemq - -Drepo.hostname=alfresco - -Drepo.port=8080 - -Ddw.server.applicationConnectors[0].type=http - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " - - ports: - - 9090:9090 + alfresco: + image: quay.io/alfresco/alfresco-content-repository:7.0.1 + mem_limit: 1700m + environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " + 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=127.0.0.1 + -Dshare.port=8080 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + -Dtransform.service.enabled=true + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dcsrf.filter.enabled=false + -Ddsync.service.uris=http://localhost:9090/alfresco + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + + transform-router: + mem_limit: 512m + image: quay.io/alfresco/alfresco-transform-router:1.4.1 + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL: "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8095:8095" + links: + - activemq + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.5.3 + mem_limit: 1536m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8090:8090" + links: + - activemq + + shared-file-store: + image: quay.io/alfresco/alfresco-shared-file-store:0.16.0 + mem_limit: 512m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + scheduler.content.age.millis: 86400000 + scheduler.cleanup.interval: 86400000 + ports: + - "8099:8099" + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + + share: + image: quay.io/alfresco/alfresco-share:7.0.1 + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: " + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " + + postgres: + image: postgres:13.1 + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - "5432:5432" + + solr6: + image: alfresco/alfresco-search-services:2.0.2 + mem_limit: 2g + 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 + # HTTP by default + - ALFRESCO_SECURE_COMMS=none + ports: + - "8083:8983" # Browser port + + activemq: + image: alfresco/alfresco-activemq:5.16.1 + mem_limit: 1g + ports: + - "8161:8161" # Web Console + - "5672:5672" # AMQP + - "61616:61616" # OpenWire + - "61613:61613" # STOMP + + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:2.5.0 + mem_limit: 128m + environment: + APP_CONFIG_AUTH_TYPE: "BASIC" + BASE_PATH: ./ + + proxy: + image: alfresco/alfresco-acs-nginx:3.2.0 + mem_limit: 128m + depends_on: + - alfresco + - digital-workspace + ports: + - "8080:8080" + links: + - digital-workspace + - alfresco + - share + + sync-service: + image: quay.io/alfresco/service-sync:3.4.0 + mem_limit: 1g + environment: + JAVA_OPTS: " + -Dsql.db.driver=org.postgresql.Driver + -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco + -Dsql.db.username=alfresco + -Dsql.db.password=alfresco + -Dmessaging.broker.host=activemq + -Drepo.hostname=alfresco + -Drepo.port=8080 + -Ddw.server.applicationConnectors[0].type=http + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + ports: + - "9090:9090" volumes: - shared-file-store-volume: - driver_opts: - type: tmpfs - device: tmpfs + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml new file mode 100644 index 000000000..9ea22397b --- /dev/null +++ b/docker-compose/7.1.N-docker-compose.yml @@ -0,0 +1,185 @@ +# This docker-compose file will spin up an ACS cluster on a local host or on a server and it requires a minimum of 13GB Memory to distribute among containers. +# +# For performance tuning, assign the container memory and give a percentage of it to the JVM. +# Use either the -Xms,-Xmx flags or the newly added flags in java 10+: -XX:MaxRAMPercentage and -XX:MinRAMPercentage. More details here: https://www.oracle.com/technetwork/java/javase/10-relnote-issues-4108729.html + +# Note: The docker-compose file from GitHub is a limited trial that goes into read-only mode after 2 days. +# Get the latest docker-compose.yml file with a 30-day trial license by accessing the Alfresco Content Services trial download page at: +# https://www.alfresco.com/platform/content-services-ecm/trial/download + +# 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: quay.io/alfresco/alfresco-content-repository:7.1.0.1 + mem_limit: 1700m + environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " + 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=127.0.0.1 + -Dshare.port=8080 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + -Dtransform.service.enabled=true + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dcsrf.filter.enabled=false + -Ddsync.service.uris=http://localhost:9090/alfresco + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + + transform-router: + mem_limit: 512m + image: quay.io/alfresco/alfresco-transform-router:1.4.1 + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL: "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8095:8095" + links: + - activemq + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.5.3 + mem_limit: 1536m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8090:8090" + links: + - activemq + + shared-file-store: + image: quay.io/alfresco/alfresco-shared-file-store:0.16.0 + mem_limit: 512m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + scheduler.content.age.millis: 86400000 + scheduler.cleanup.interval: 86400000 + ports: + - "8099:8099" + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + + share: + image: quay.io/alfresco/alfresco-share:7.1.0.1 + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: " + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " + + postgres: + image: postgres:13.3 + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - "5432:5432" + + solr6: + image: alfresco/alfresco-search-services:2.0.2 + mem_limit: 2g + 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 + # HTTP by default + - ALFRESCO_SECURE_COMMS=none + ports: + - "8083:8983" # Browser port + + activemq: + image: alfresco/alfresco-activemq:5.16.1 + mem_limit: 1g + ports: + - "8161:8161" # Web Console + - "5672:5672" # AMQP + - "61616:61616" # OpenWire + - "61613:61613" # STOMP + + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:2.5.0 + mem_limit: 128m + environment: + APP_CONFIG_AUTH_TYPE: "BASIC" + BASE_PATH: ./ + + proxy: + image: alfresco/alfresco-acs-nginx:3.2.0 + mem_limit: 128m + depends_on: + - alfresco + - digital-workspace + ports: + - "8080:8080" + links: + - digital-workspace + - alfresco + - share + + sync-service: + image: quay.io/alfresco/service-sync:3.4.0 + mem_limit: 1g + environment: + JAVA_OPTS: " + -Dsql.db.driver=org.postgresql.Driver + -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco + -Dsql.db.username=alfresco + -Dsql.db.password=alfresco + -Dmessaging.broker.host=activemq + -Drepo.hostname=alfresco + -Drepo.port=8080 + -Ddw.server.applicationConnectors[0].type=http + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + ports: + - "9090:9090" + +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs diff --git a/docker-compose/README.md b/docker-compose/README.md index 339ba4a5f..eb5d58542 100644 --- a/docker-compose/README.md +++ b/docker-compose/README.md @@ -1,3 +1,3 @@ # Alfresco Content Services (ACS) Docker Compose -Please refer to the [documentation](/docs/docker-compose/README.md) for information on the Docker compose file and deployment instructions. \ No newline at end of file +Please refer to the [documentation](/docs/docker-compose/README.md) for information on the Docker compose file and deployment instructions. diff --git a/docker-compose/community-docker-compose.yml b/docker-compose/community-docker-compose.yml index 3f3e22689..ed0232373 100644 --- a/docker-compose/community-docker-compose.yml +++ b/docker-compose/community-docker-compose.yml @@ -9,114 +9,114 @@ version: "2" services: - alfresco: - image: alfresco/alfresco-content-repository-community:7.1.0.1 - mem_limit: 1500m - environment: - JAVA_TOOL_OPTIONS: " - -Dencryption.keystore.type=JCEKS - -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding - -Dencryption.keyAlgorithm=DESede - -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore - -Dmetadata-keystore.password=mp6yc0UD9e - -Dmetadata-keystore.aliases=metadata - -Dmetadata-keystore.metadata.password=oKIWzVdEdA - -Dmetadata-keystore.metadata.algorithm=DESede - " - 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.http.connection.timeout=1000 - -Dsolr.secureComms=none - -Dsolr.base.url=/solr - -Dindex.subsystem.name=solr6 - -Dshare.host=127.0.0.1 - -Dshare.port=8080 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos - -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" - -Ddeployment.method=DOCKER_COMPOSE - -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " + alfresco: + image: alfresco/alfresco-content-repository-community:7.2.0-M1 + mem_limit: 1500m + environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " + 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.http.connection.timeout=1000 + -Dsolr.secureComms=none + -Dsolr.base.url=/solr + -Dindex.subsystem.name=solr6 + -Dshare.host=127.0.0.1 + -Dshare.port=8080 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dcsrf.filter.enabled=false + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " - transform-core-aio: - image: alfresco/alfresco-transform-core-aio:2.5.3 - mem_limit: 1536m - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ports: - - 8090:8090 + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.5.3 + mem_limit: 1536m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ports: + - "8090:8090" - share: - image: alfresco/alfresco-share:7.1.0.1 - mem_limit: 1g - environment: - REPO_HOST: "alfresco" - REPO_PORT: "8080" - JAVA_OPTS: " - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Dalfresco.context=alfresco - -Dalfresco.protocol=http - " + share: + image: alfresco/alfresco-share:7.2.0-M1 + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: " + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " - postgres: - image: postgres:13.1 - mem_limit: 512m - environment: - - POSTGRES_PASSWORD=alfresco - - POSTGRES_USER=alfresco - - POSTGRES_DB=alfresco - command: postgres -c max_connections=300 -c log_min_messages=LOG - ports: - - 5432:5432 + postgres: + image: postgres:13.3 + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - "5432:5432" - solr6: - image: alfresco/alfresco-search-services:2.0.2 - mem_limit: 2g - 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 - #HTTP by default - - ALFRESCO_SECURE_COMMS=none - ports: - - 8083:8983 #Browser port + solr6: + image: alfresco/alfresco-search-services:2.0.2 + mem_limit: 2g + 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 + # HTTP by default + - ALFRESCO_SECURE_COMMS=none + ports: + - "8083:8983" # Browser port - activemq: - image: alfresco/alfresco-activemq:5.16.1 - mem_limit: 1g - ports: - - 8161:8161 # Web Console - - 5672:5672 # AMQP - - 61616:61616 # OpenWire - - 61613:61613 # STOMP + activemq: + image: alfresco/alfresco-activemq:5.16.1 + mem_limit: 1g + ports: + - "8161:8161" # Web Console + - "5672:5672" # AMQP + - "61616:61616" # OpenWire + - "61613:61613" # STOMP - proxy: - image: alfresco/alfresco-acs-nginx:3.1.1 - mem_limit: 128m - environment: - DISABLE_PROMETHEUS: "true" - DISABLE_SYNCSERVICE: "true" - DISABLE_ADW: "true" - depends_on: - - alfresco - ports: - - 8080:8080 - links: - - alfresco - - share + proxy: + image: alfresco/alfresco-acs-nginx:3.2.0 + mem_limit: 128m + environment: + DISABLE_PROMETHEUS: "true" + DISABLE_SYNCSERVICE: "true" + DISABLE_ADW: "true" + depends_on: + - alfresco + ports: + - "8080:8080" + links: + - alfresco + - share diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index ae42a3d68..d0cd18f30 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -3,7 +3,7 @@ # For performance tuning, assign the container memory and give a percentage of it to the JVM. # Use either the -Xms,-Xmx flags or the newly added flags in java 10+: -XX:MaxRAMPercentage and -XX:MinRAMPercentage. More details here: https://www.oracle.com/technetwork/java/javase/10-relnote-issues-4108729.html -# Note: The docker-compose file from github.com is a limited trial that goes into read-only mode after 2 days. +# Note: The docker-compose file from GitHub is a limited trial that goes into read-only mode after 2 days. # Get the latest docker-compose.yml file with a 30-day trial license by accessing the Alfresco Content Services trial download page at: # https://www.alfresco.com/platform/content-services-ecm/trial/download @@ -11,179 +11,175 @@ version: "2" services: - alfresco: - image: quay.io/alfresco/alfresco-content-repository:7.1.0.1 - mem_limit: 1700m - environment: - JAVA_TOOL_OPTIONS: " - -Dencryption.keystore.type=JCEKS - -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding - -Dencryption.keyAlgorithm=DESede - -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore - -Dmetadata-keystore.password=mp6yc0UD9e - -Dmetadata-keystore.aliases=metadata - -Dmetadata-keystore.metadata.password=oKIWzVdEdA - -Dmetadata-keystore.metadata.algorithm=DESede - " - 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=127.0.0.1 - -Dshare.port=8080 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos - -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" - -Ddeployment.method=DOCKER_COMPOSE - -Dtransform.service.enabled=true - -Dtransform.service.url=http://transform-router:8095 - -Dsfs.url=http://shared-file-store:8099/ - -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ - -Dcsrf.filter.enabled=false - -Ddsync.service.uris=http://localhost:9090/alfresco - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " - - transform-router: - mem_limit: 512m - image: quay.io/alfresco/alfresco-transform-router:1.4.1 - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - - CORE_AIO_URL : "http://transform-core-aio:8090" - - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8095:8095 - links: - - activemq - - transform-core-aio: - image: alfresco/alfresco-transform-core-aio:2.5.3 - mem_limit: 1536m - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - ACTIVEMQ_URL: "nio://activemq:61616" - FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" - ports: - - 8090:8090 - links: - - activemq - - shared-file-store: - image: quay.io/alfresco/alfresco-shared-file-store:0.16.0 - mem_limit: 512m - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - scheduler.content.age.millis: 86400000 - scheduler.cleanup.interval: 86400000 - ports: - - 8099:8099 - volumes: - - shared-file-store-volume:/tmp/Alfresco/sfs - - share: - image: quay.io/alfresco/alfresco-share:7.1.0.1 - mem_limit: 1g - environment: - REPO_HOST: "alfresco" - REPO_PORT: "8080" - JAVA_OPTS: " - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Dalfresco.context=alfresco - -Dalfresco.protocol=http - " - - postgres: - image: postgres:13.1 - mem_limit: 512m - environment: - - POSTGRES_PASSWORD=alfresco - - POSTGRES_USER=alfresco - - POSTGRES_DB=alfresco - command: postgres -c max_connections=300 -c log_min_messages=LOG - ports: - - 5432:5432 - - solr6: - image: alfresco/alfresco-search-services:2.0.2 - mem_limit: 2g - 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 - #HTTP by default - - ALFRESCO_SECURE_COMMS=none - ports: - - 8083:8983 #Browser port - - activemq: - image: alfresco/alfresco-activemq:5.16.1 - mem_limit: 1g - ports: - - 8161:8161 # Web Console - - 5672:5672 # AMQP - - 61616:61616 # OpenWire - - 61613:61613 # STOMP - - digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:2.4.2-adw - mem_limit: 128m - environment: - APP_CONFIG_AUTH_TYPE: "BASIC" - BASE_PATH: ./ - - proxy: - image: alfresco/alfresco-acs-nginx:3.1.1 - mem_limit: 128m - depends_on: - - alfresco - - digital-workspace - ports: - - 8080:8080 - links: - - digital-workspace - - alfresco - - share - - sync-service: - image: quay.io/alfresco/service-sync:3.5.0-M1 - mem_limit: 1g - environment: - JAVA_OPTS : " - -Dsql.db.driver=org.postgresql.Driver - -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco - -Dsql.db.username=alfresco - -Dsql.db.password=alfresco - -Dmessaging.broker.host=activemq - -Drepo.hostname=alfresco - -Drepo.port=8080 - -Ddw.server.applicationConnectors[0].type=http - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - " - - ports: - - 9090:9090 + alfresco: + image: quay.io/alfresco/alfresco-content-repository:7.2.0-M1 + mem_limit: 1700m + environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede + " + 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=127.0.0.1 + -Dshare.port=8080 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + -Dtransform.service.enabled=true + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099/ + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dcsrf.filter.enabled=false + -Ddsync.service.uris=http://localhost:9090/alfresco + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + + transform-router: + mem_limit: 512m + image: quay.io/alfresco/alfresco-transform-router:1.4.1 + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL: "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8095:8095" + links: + - activemq + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.5.3 + mem_limit: 1536m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + ports: + - "8090:8090" + links: + - activemq + + shared-file-store: + image: quay.io/alfresco/alfresco-shared-file-store:0.16.0 + mem_limit: 512m + environment: + JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" + scheduler.content.age.millis: 86400000 + scheduler.cleanup.interval: 86400000 + ports: + - "8099:8099" + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + + share: + image: quay.io/alfresco/alfresco-share:7.2.0-M1 + mem_limit: 1g + environment: + REPO_HOST: "alfresco" + REPO_PORT: "8080" + JAVA_OPTS: " + -XX:MinRAMPercentage=50 + -XX:MaxRAMPercentage=80 + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Dalfresco.context=alfresco + -Dalfresco.protocol=http + " + + postgres: + image: postgres:13.3 + mem_limit: 512m + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - "5432:5432" + + solr6: + image: alfresco/alfresco-search-services:2.0.2 + mem_limit: 2g + 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 + # HTTP by default + - ALFRESCO_SECURE_COMMS=none + ports: + - "8083:8983" # Browser port + + activemq: + image: alfresco/alfresco-activemq:5.16.1 + mem_limit: 1g + ports: + - "8161:8161" # Web Console + - "5672:5672" # AMQP + - "61616:61616" # OpenWire + - "61613:61613" # STOMP + + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:2.5.0 + mem_limit: 128m + environment: + APP_CONFIG_AUTH_TYPE: "BASIC" + BASE_PATH: ./ + + proxy: + image: alfresco/alfresco-acs-nginx:3.2.0 + mem_limit: 128m + depends_on: + - alfresco + - digital-workspace + ports: + - "8080:8080" + links: + - digital-workspace + - alfresco + - share + + sync-service: + image: quay.io/alfresco/service-sync:3.5.0-M1 + mem_limit: 1g + environment: + JAVA_OPTS: " + -Dsql.db.driver=org.postgresql.Driver + -Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco + -Dsql.db.username=alfresco + -Dsql.db.password=alfresco + -Dmessaging.broker.host=activemq + -Drepo.hostname=alfresco + -Drepo.port=8080 + -Ddw.server.applicationConnectors[0].type=http + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + ports: + - "9090:9090" volumes: - shared-file-store-volume: - driver_opts: - type: tmpfs - - device: tmpfs + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs diff --git a/docs/docker-compose/README.md b/docs/docker-compose/README.md index 183448a1f..e14d2edf3 100644 --- a/docs/docker-compose/README.md +++ b/docs/docker-compose/README.md @@ -233,8 +233,8 @@ alfresco-proxy: - alfresco - digital-workspace ports: - - 443:443 # when USE_SSL="true" -# - 8080:8080 #default + - "443:443" # when USE_SSL="true" +# - "8080:8080" # default links: - digital-workspace - alfresco diff --git a/helm/alfresco-content-services/6.1.N_values.yaml b/helm/alfresco-content-services/6.1.N_values.yaml index f631e940d..1d3c4b15f 100644 --- a/helm/alfresco-content-services/6.1.N_values.yaml +++ b/helm/alfresco-content-services/6.1.N_values.yaml @@ -1,654 +1,70 @@ # This is a YAML-formatted file. Declare variables to be passed into your templates. -# ACS will be created in a k8s cluster with a minimum of 16GB memory to split among below nodes: -# 2 x repository, 1 x share, 1 x transformers (pdfrenderer, imagemagick, libreoffice, tika, misc) and 1 x postgresql - -# Limit container memory and assign X percentage to JVM. There are couple of ways to allocate JVM Memory for ACS Containers -# For example: 'JAVA_OPTS: "$JAVA_OPTS -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"' -# But, as per Oracle docs (https://docs.oracle.com/javase/9/gctuning/parallel-collector1.htm#JSGCT-GUID-CAB83393-3438-44ED-98F0-D15641B43C7D) -# If container memory is not explicitly set, then the above flags will default max heap to 1/4th of container's memory which may not be ideal. -# Hence, setting up explicit Container memory and then assigning a percentage of it to the JVM for performance tuning. - repository: - edition: Enterprise - replicaCount: 2 - strategy: - type: Recreate image: - repository: alfresco/alfresco-content-repository tag: 6.1.1 - pullPolicy: IfNotPresent - internalPort: 8080 - hazelcastPort: 5701 - initContainers: - db: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - resources: - requests: - memory: "5Mi" - limits: - memory: "10Mi" - fs: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - resources: - requests: - memory: "5Mi" - limits: - memory: "10Mi" - service: - name: alfresco - type: ClusterIP - externalPort: &repositoryExternalPort 80 - ingress: - path: / - maxUploadSize: "5g" - annotations: {} - # nginx.ingress.kubernetes.io/enable-cors: "true" - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local environment: - JAVA_OPTS: " -Dsolr.base.url=/solr - -Dsolr.secureComms=none - -Dindex.subsystem.name=solr6 - -Dalfresco.cluster.enabled=true - -Ddeployment.method=HELM_CHART - -Dtransform.service.enabled=true - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - JAVA_TOOL_OPTIONS: " -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.algorithm=AES" - resources: - requests: - memory: "3000Mi" - limits: - memory: "3000Mi" - # The repository readiness probe is used to check startup only as a failure - # of the liveness probe later will result in the pod being restarted. - readinessProbe: - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - failureThreshold: 6 - livenessProbe: - initialDelaySeconds: 130 - periodSeconds: 20 - timeoutSeconds: 10 - # Provide additional log statements by adding - # classes and/or packages in a key:value fashion - # extraLogStatements: - # org.alfresco.repo.content.transform.TransformerDebug: debug - # org.alfresco.repo.security.authentication.identityservice: debug - -# Declares the api-explorer service used by the content repository -apiexplorer: - ingress: - path: /api-explorer + JAVA_TOOL_OPTIONS: " + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.algorithm=AES + " transformrouter: - replicaCount: 2 image: - repository: quay.io/alfresco/alfresco-transform-router tag: 1.0.2 - pullPolicy: IfNotPresent - internalPort: 8095 - service: - name: transform-router - type: ClusterIP - externalPort: 80 - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 140 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 140 - periodSeconds: 120 - timeoutSeconds: 60 - resources: - requests: - memory: "128Mi" - limits: - memory: "512Mi" -# Declares the alfresco-pdf-renderer service used by the content repository -# to transform pdf files pdfrenderer: - replicaCount: 2 image: repository: quay.io/alfresco/alfresco-pdf-renderer tag: 2.0.17 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: pdfrenderer - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 150 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1200 -# Declares the alfresco-imagemagick service used by the content repository -# to transform image files imagemagick: - replicaCount: 2 image: repository: quay.io/alfresco/alfresco-imagemagick tag: 2.0.17 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: imagemagick - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 150 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 900 -# Declares the alfresco-libreoffice service used by the content repository -# to transform office files libreoffice: - replicaCount: 2 image: repository: quay.io/alfresco/alfresco-libreoffice tag: 2.0.17 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: libreoffice - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 250 - livenessTransformPeriodSeconds: 600 - maxTransforms: 99999 - maxTransformSeconds: 1800 -# Declares the alfresco-tika service used by the content repository -# to transform office files tika: - replicaCount: 2 image: repository: quay.io/alfresco/alfresco-tika tag: 2.0.17 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: tika - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 400 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1800 transformmisc: enabled: false aiTransformer: - replicaCount: 2 image: - repository: quay.io/alfresco/alfresco-ai-docker-engine tag: 1.0.2 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: ai-transformer - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 400 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1800 -# Declares the alfresco-shared-file-store used by the content repository -# and transform service filestore: - replicaCount: 1 image: - repository: alfresco/alfresco-shared-file-store tag: 0.5.3 - pullPolicy: IfNotPresent - internalPort: 8099 - initContainer: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - resources: - requests: - memory: "5Mi" - limits: - memory: "10Mi" - service: - name: filestore - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - scheduler.content.age.millis: "86400000" - scheduler.cleanup.interval: "86400000" - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 150 - livenessSavePeriodSeconds: 600 -# Define the alfresco-share properties to use in the k8s cluster -# This is the default presentation layer(UI) of Alfresco Content Services share: - replicaCount: 1 image: - repository: alfresco/alfresco-share tag: 6.1.1 - pullPolicy: IfNotPresent - internalPort: 8080 - service: - name: share - type: ClusterIP - externalPort: 80 - ingress: - path: /share - annotations: {} - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - resources: - requests: - memory: "2000Mi" - limits: - memory: "2000Mi" - environment: - CATALINA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 130 - periodSeconds: 20 - timeoutSeconds: 10 - -# Defines the mounting points for the persistence required by the apps in the -# cluster the alf_data folder from alfresco-content-repository app is mapped to -# alfresco-content-services/repository-data -persistence: - enabled: true - baseSize: 20Gi - storageClass: #enable and define if you already have a custom storage class defined - enabled: false - accessModes: - - ReadWriteMany - name: "nfs" #Custom storage classs name - existingClaim: "alfresco-volume-claim" - repository: - enabled: true - config: - querysetsMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/querysets/" - transform: - renditionsMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/transform/renditions/" - pipelinesMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/transform/pipelines/" - mimetypesMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/mimetypes/" - data: - mountPath: "/usr/local/tomcat/alf_data" - subPath: "alfresco-content-services/repository-data" - filestore: - enabled: true - data: - mountPath: "/tmp/Alfresco" - subPath: "alfresco-content-services/filestore-data" - -activemq: - enabled: true alfresco-search: - type: "search-services" - enabled: true -# If enabled is set to false, then external host and port need to point to the external instance of SOLR6, and in this case: -# Note: Rule_05-network-policy-search will be disabled. -# Note: Rule_04-network-policy-repository internal trafic to SOLR6 instance will be disabled. -# Note: ingress-repository will not block external trafic to */solr/* -# external: - # Host dns/ip of the external solr6 instance. -# host: "127.0.0.1" - # Port of the external solr6 instance. -# port: "8983" searchServicesImage: tag: 1.4.3 - repository: &repositoryHostPort - # The value for "host" is the name of this chart - host: alfresco-cs - port: *repositoryExternalPort - alfresco-insight-zeppelin: - insightzeppelin: - enabled: false - repository: *repositoryHostPort - ingress: - # Alfresco Search services endpoint ('/solr') is disabled by default - # To enable it please see: acs-deployment configuration table](https://github.com/Alfresco/acs-deployment/tree/master/helm/alfresco-content-services#configuration) - enabled: false - # Default solr basic auth user/password: admin / admin - # You can create your own with htpasswd utilility & encode it with base640. - # Example: `echo -n "$(htpasswd -nbm admin admin)" | base64` # i.e. admin / admin - # basicAuth: YWRtaW46JGFwcjEkVVJqb29uS00kSEMuS1EwVkRScFpwSHB2a3JwTDd1Lg== - basicAuth: - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local alfresco-digital-workspace: - enabled: true - nameOverride: "alfresco-dw" - service: - envType: frontend - ingress: - path: /workspace - annotations: - nginx.ingress.kubernetes.io/proxy-body-size: "5g" - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local image: - repository: quay.io/alfresco/alfresco-digital-workspace tag: 1.4.0 - pullPolicy: IfNotPresent - env: - APP_CONFIG_AUTH_TYPE: "BASIC" - API_URL: "{protocol}//{hostname}{:port}" - -# choose if you want AI capabilities -ai: - enabled: false - # aws: - # accessKey: - # secretAccessKey: - # region: - # s3Bucket: - # comprehendRoleARN: - -# Defines properties required by alfresco for connecting to the database -# Note! : If you set database.external to true you will have to setup the driver, user, password and JdbcUrl -# Also make sure that the container has the db driver in /usr/local/tomcat/lib since the current image only has the postgresql driver -database: - external: false - # driver: #ex: org.postgresql.Driver - # user: #ex: alfresco - # password: #ex: alfresco - # url: # ex: jdbc:postgresql://oldfashioned-mule-postgresql-acs:5432/alfresco - -# Defines the properties to be used for the required postgres DB -# Note: the database (tables) information is also saved in the persistent volume claim postgresql: - replicaCount: 1 - ## If true, install the postgresql chart alongside Alfresco Content Services. - # Note: Set this to false if you use an external database. - enabled: true - nameOverride: postgresql-acs image: tag: 11.4.0 - pullPolicy: IfNotPresent - postgresqlUsername: alfresco - postgresqlPassword: alfresco - postgresqlDatabase: alfresco - postgresqlExtendedConf: - max_connections: 300 - log_min_messages: LOG - volumePermissions: - enabled: true - resources: - requests: - memory: "1500Mi" - limits: - memory: "1500Mi" postgresql-syncservice: - ## If true, install the postgresql chart alongside Alfresco Sync service. - # Note: Set this to false if you use an external database. - name: postgresql-syncservice - enabled: true - replicaCount: 1 - nameOverride: postgresql-syncservice image: tag: 11.4.0 - pullPolicy: IfNotPresent - volumePermissions: - enabled: true - postgresqlUsername: alfresco - postgresqlPassword: admin - postgresqlDatabase: syncservice-postgresql - postgresqlExtendedConf: - max_connections: 450 - log_min_messages: LOG - service: - port: 5432 - resources: - requests: - memory: "1500Mi" - limits: - memory: "1500Mi" - -# Defines the properties to be used for the S3 Connector -s3connector: - enabled: false - # config: - # bucketName: - # bucketLocation: - ## Additional properties can be defined here. - ## For a full list of properties on the S3 connector, please view: https://docs.alfresco.com/s3connector/references/s3-contentstore-ref-config-props.html - # secrets: - # accessKey: - # secretKey: - # encryption: - # awsKmsKeyId: - -## For a full information of properties on the email configuration, please view: https://docs.alfresco.com/6.2/concepts/email.html -email: - server: - enabled: false - port: 1125 - domain: - enableTLS: true - hideTLS: false - requireTLS: false - auth: - enabled: true - connections: - max: 3 - allowed: - senders: .* - blocked: - senders: - inbound: - enabled: false - unknownUser: anonymous - emailContributorsAuthority: EMAIL_CONTRIBUTORS - handler: - folder: - overwriteDuplicates: true - ssl: - secretName: - initContainers: - pemToKeystore: - image: - repository: registry.access.redhat.com/redhat-sso-7/sso71-openshift - tag: 1.1-16 - pullPolicy: IfNotPresent - pemToTruststore: - image: - repository: registry.access.redhat.com/redhat-sso-7/sso71-openshift - tag: 1.1-16 - pullPolicy: IfNotPresent - setPerms: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - -mail: - host: - port: - protocol: smtps - encoding: UTF-8 - username: - password: - from: - default: - enabled: false - smtp: - auth: true - debug: false - timeout: 30000 - starttls: - enable: true - smtps: - auth: true - starttls: - enable: true - # DO NOT USE: It breaks repo pod with Error: Could not find or load main class SMTP Caused by: java.lang.ClassNotFoundException: SMTP - # testmessage: - # send: false - # subject: "Outbound SMTP" - # text: "The Outbound SMTP email subsystem is working." - # to: - -imap: - server: - enabled: false - host: "0.0.0.0" - port: 1143 - imap: - enabled: true - imaps: - enabled: true - port: 1144 - mail: - from: - default: - to: - default: - -metadataKeystore: - # keystorePassword: "" - # keyPassword: "" - defaultKeystorePassword: "mp6yc0UD9e" - defaultKeyPassword: "mp6yc0UD9e" alfresco-sync-service: syncservice: - enabled : true image: - repository: quay.io/alfresco/service-sync tag: 3.1.2 - -# If there is a need to pull images from a private docker repo, a secret can be defined in helm and passed as an argument -# to the install command: -# e.g.: helm install alfresco-content-services --set global.alfrescoRegistryPullSecrets=quay-registry-secret -# or uncomment the following line if you don't want/need to pass it as a parameter on every install command : -# global.alfrescoRegistryPullSecrets: quay-registry-secret -# for more information: https://github.com/Alfresco/alfresco-anaxes-shipyard/blob/master/SECRETS.md - -# Global definition of Docker registry pull secret which can be accessed by dependent ACS Helm chart(s) -global: - alfrescoRegistryPullSecrets: - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - registryPullSecrets: - - quay-registry-secret diff --git a/helm/alfresco-content-services/6.2.N_values.yaml b/helm/alfresco-content-services/6.2.N_values.yaml index 906068f33..7201b3b7a 100644 --- a/helm/alfresco-content-services/6.2.N_values.yaml +++ b/helm/alfresco-content-services/6.2.N_values.yaml @@ -1,684 +1,63 @@ # This is a YAML-formatted file. Declare variables to be passed into your templates. -# ACS will be created in a k8s cluster with a minimum of 16GB memory to split among below nodes: -# 2 x repository, 1 x share, 1 x transformers (pdfrenderer, imagemagick, libreoffice, tika, misc) and 1 x postgresql - -# Limit container memory and assign X percentage to JVM. There are couple of ways to allocate JVM Memory for ACS Containers -# For example: 'JAVA_OPTS: "$JAVA_OPTS -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"' -# But, as per Oracle docs (https://docs.oracle.com/javase/9/gctuning/parallel-collector1.htm#JSGCT-GUID-CAB83393-3438-44ED-98F0-D15641B43C7D) -# If container memory is not explicitly set, then the above flags will default max heap to 1/4th of container's memory which may not be ideal. -# Hence, setting up explicit Container memory and then assigning a percentage of it to the JVM for performance tuning. - repository: - edition: Enterprise - replicaCount: 2 - strategy: - type: Recreate image: - repository: quay.io/alfresco/alfresco-content-repository tag: 6.2.2 - pullPolicy: IfNotPresent - internalPort: 8080 - hazelcastPort: 5701 - initContainers: - db: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - resources: - requests: - memory: "5Mi" - limits: - memory: "10Mi" - fs: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - resources: - requests: - memory: "5Mi" - limits: - memory: "10Mi" - service: - name: alfresco - type: ClusterIP - externalPort: &repositoryExternalPort 80 - ingress: - path: / - maxUploadSize: "5g" - annotations: {} - # nginx.ingress.kubernetes.io/enable-cors: "true" - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local environment: - JAVA_OPTS: " -Dsolr.base.url=/solr - -Dsolr.secureComms=none - -Dindex.subsystem.name=solr6 - -Dalfresco.cluster.enabled=true - -Ddeployment.method=HELM_CHART - -Dtransform.service.enabled=true - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - JAVA_TOOL_OPTIONS: " -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.algorithm=AES" - resources: - requests: - memory: "3000Mi" - limits: - memory: "3000Mi" - # The repository readiness probe is used to check startup only as a failure - # of the liveness probe later will result in the pod being restarted. - readinessProbe: - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - failureThreshold: 6 - livenessProbe: - initialDelaySeconds: 130 - periodSeconds: 20 - timeoutSeconds: 10 - # Provide additional log statements by adding - # classes and/or packages in a key:value fashion - # extraLogStatements: - # org.alfresco.repo.content.transform.TransformerDebug: debug - # org.alfresco.repo.security.authentication.identityservice: debug - -# Declares the api-explorer service used by the content repository -apiexplorer: - ingress: - path: /api-explorer + JAVA_TOOL_OPTIONS: " + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.algorithm=AES + " transformrouter: - replicaCount: 2 image: - repository: quay.io/alfresco/alfresco-transform-router tag: 1.4.1 - pullPolicy: IfNotPresent - internalPort: 8095 - service: - name: transform-router - type: ClusterIP - externalPort: 80 - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 140 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 140 - periodSeconds: 120 - timeoutSeconds: 60 - resources: - requests: - memory: "128Mi" - limits: - memory: "512Mi" -# Declares the alfresco-pdf-renderer service used by the content repository -# to transform pdf files pdfrenderer: - replicaCount: 2 image: - repository: alfresco/alfresco-pdf-renderer tag: 2.5.1 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: pdfrenderer - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 150 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1200 -# Declares the alfresco-imagemagick service used by the content repository -# to transform image files imagemagick: - replicaCount: 2 image: - repository: alfresco/alfresco-imagemagick tag: 2.5.1 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: imagemagick - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 150 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 900 -# Declares the alfresco-libreoffice service used by the content repository -# to transform office files libreoffice: - replicaCount: 2 image: - repository: alfresco/alfresco-libreoffice tag: 2.5.1 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: libreoffice - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 250 - livenessTransformPeriodSeconds: 600 - maxTransforms: 99999 - maxTransformSeconds: 1800 -# Declares the alfresco-tika service used by the content repository -# to transform office files tika: - replicaCount: 2 image: - repository: alfresco/alfresco-tika tag: 2.5.1 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: tika - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 400 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1800 -# Declares the alfresco-tika service used by the content repository -# to transform office files transformmisc: - enabled: true - replicaCount: 2 image: - repository: alfresco/alfresco-transform-misc tag: 2.5.1 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: transformmisc - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 400 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1800 aiTransformer: - replicaCount: 2 image: - repository: quay.io/alfresco/alfresco-ai-docker-engine tag: 1.2.0 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: ai-transformer - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 400 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1800 -# Declares the alfresco-shared-file-store used by the content repository -# and transform service filestore: - replicaCount: 1 image: - repository: quay.io/alfresco/alfresco-shared-file-store tag: 0.16.0 - pullPolicy: IfNotPresent - internalPort: 8099 - initContainer: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - resources: - requests: - memory: "5Mi" - limits: - memory: "10Mi" - service: - name: filestore - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - scheduler.content.age.millis: "86400000" - scheduler.cleanup.interval: "86400000" - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 150 - livenessSavePeriodSeconds: 600 -# Define the alfresco-share properties to use in the k8s cluster -# This is the default presentation layer(UI) of Alfresco Content Services share: - replicaCount: 1 image: - repository: alfresco/alfresco-share tag: 6.2.2 - pullPolicy: IfNotPresent - internalPort: 8080 - service: - name: share - type: ClusterIP - externalPort: 80 - ingress: - path: /share - annotations: {} - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - resources: - requests: - memory: "2000Mi" - limits: - memory: "2000Mi" - environment: - CATALINA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 130 - periodSeconds: 20 - timeoutSeconds: 10 - -# Defines the mounting points for the persistence required by the apps in the -# cluster the alf_data folder from alfresco-content-repository app is mapped to -# alfresco-content-services/repository-data -persistence: - enabled: true - baseSize: 20Gi - storageClass: #enable and define if you already have a custom storage class defined - enabled: false - accessModes: - - ReadWriteMany - name: "nfs" #Custom storage classs name - existingClaim: "alfresco-volume-claim" - repository: - enabled: true - config: - querysetsMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/querysets/" - transform: - renditionsMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/transform/renditions/" - pipelinesMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/transform/pipelines/" - mimetypesMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/mimetypes/" - data: - mountPath: "/usr/local/tomcat/alf_data" - subPath: "alfresco-content-services/repository-data" - filestore: - enabled: true - data: - mountPath: "/tmp/Alfresco" - subPath: "alfresco-content-services/filestore-data" - -activemq: - enabled: true alfresco-search: - type: "search-services" - enabled: true -# If enabled is set to false, then external host and port need to point to the external instance of SOLR6, and in this case: -# Note: Rule_05-network-policy-search will be disabled. -# Note: Rule_04-network-policy-repository internal trafic to SOLR6 instance will be disabled. -# Note: ingress-repository will not block external trafic to */solr/* -# external: - # Host dns/ip of the external solr6 instance. -# host: "127.0.0.1" - # Port of the external solr6 instance. -# port: "8983" searchServicesImage: tag: 1.4.3 - repository: &repositoryHostPort - # The value for "host" is the name of this chart - host: alfresco-cs - port: *repositoryExternalPort - alfresco-insight-zeppelin: - insightzeppelin: - enabled: false - repository: *repositoryHostPort - ingress: - # Alfresco Search services endpoint ('/solr') is disabled by default - # To enable it please see: acs-deployment configuration table](https://github.com/Alfresco/acs-deployment/tree/master/helm/alfresco-content-services#configuration) - enabled: false - # Default solr basic auth user/password: admin / admin - # You can create your own with htpasswd utilility & encode it with base640. - # Example: `echo -n "$(htpasswd -nbm admin admin)" | base64` # i.e. admin / admin - # basicAuth: YWRtaW46JGFwcjEkVVJqb29uS00kSEMuS1EwVkRScFpwSHB2a3JwTDd1Lg== - basicAuth: - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -alfresco-digital-workspace: - enabled: true - nameOverride: "alfresco-dw" - service: - envType: frontend - ingress: - path: /workspace - annotations: - nginx.ingress.kubernetes.io/proxy-body-size: "5g" - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - image: - repository: quay.io/alfresco/alfresco-digital-workspace - tag: 2.4.2-adw - pullPolicy: IfNotPresent - env: - APP_CONFIG_AUTH_TYPE: "BASIC" - API_URL: "{protocol}//{hostname}{:port}" -# choose if you want AI capabilities -ai: - enabled: false - # aws: - # accessKey: - # secretAccessKey: - # region: - # s3Bucket: - # comprehendRoleARN: - -# Defines properties required by alfresco for connecting to the database -# Note! : If you set database.external to true you will have to setup the driver, user, password and JdbcUrl -# Also make sure that the container has the db driver in /usr/local/tomcat/lib since the current image only has the postgresql driver -database: - external: false - # driver: #ex: org.postgresql.Driver - # user: #ex: alfresco - # password: #ex: alfresco - # url: # ex: jdbc:postgresql://oldfashioned-mule-postgresql-acs:5432/alfresco - -# Defines the properties to be used for the required postgres DB -# Note: the database (tables) information is also saved in the persistent volume claim postgresql: - replicaCount: 1 - ## If true, install the postgresql chart alongside Alfresco Content Services. - # Note: Set this to false if you use an external database. - enabled: true - nameOverride: postgresql-acs image: tag: 11.7.0 - pullPolicy: IfNotPresent - postgresqlUsername: alfresco - postgresqlPassword: alfresco - postgresqlDatabase: alfresco - postgresqlExtendedConf: - max_connections: 300 - log_min_messages: LOG - volumePermissions: - enabled: true - resources: - requests: - memory: "1500Mi" - limits: - memory: "1500Mi" postgresql-syncservice: - ## If true, install the postgresql chart alongside Alfresco Sync service. - # Note: Set this to false if you use an external database. - name: postgresql-syncservice - enabled: true - replicaCount: 1 - nameOverride: postgresql-syncservice image: tag: 11.7.0 - pullPolicy: IfNotPresent - volumePermissions: - enabled: true - postgresqlUsername: alfresco - postgresqlPassword: admin - postgresqlDatabase: syncservice-postgresql - postgresqlExtendedConf: - max_connections: 450 - log_min_messages: LOG - service: - port: 5432 - resources: - requests: - memory: "1500Mi" - limits: - memory: "1500Mi" - -# Defines the properties to be used for the S3 Connector -s3connector: - enabled: false - # config: - # bucketName: - # bucketLocation: - ## Additional properties can be defined here. - ## For a full list of properties on the S3 connector, please view: https://docs.alfresco.com/s3connector/references/s3-contentstore-ref-config-props.html - # secrets: - # accessKey: - # secretKey: - # encryption: - # awsKmsKeyId: - -## For a full information of properties on the email configuration, please view: https://docs.alfresco.com/6.2/concepts/email.html -email: - server: - enabled: false - port: 1125 - domain: - enableTLS: true - hideTLS: false - requireTLS: false - auth: - enabled: true - connections: - max: 3 - allowed: - senders: .* - blocked: - senders: - inbound: - enabled: false - unknownUser: anonymous - emailContributorsAuthority: EMAIL_CONTRIBUTORS - handler: - folder: - overwriteDuplicates: true - ssl: - secretName: - initContainers: - pemToKeystore: - image: - repository: registry.access.redhat.com/redhat-sso-7/sso71-openshift - tag: 1.1-16 - pullPolicy: IfNotPresent - pemToTruststore: - image: - repository: registry.access.redhat.com/redhat-sso-7/sso71-openshift - tag: 1.1-16 - pullPolicy: IfNotPresent - setPerms: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - -mail: - host: - port: - protocol: smtps - encoding: UTF-8 - username: - password: - from: - default: - enabled: false - smtp: - auth: true - debug: false - timeout: 30000 - starttls: - enable: true - smtps: - auth: true - starttls: - enable: true - # DO NOT USE: It breaks repo pod with Error: Could not find or load main class SMTP Caused by: java.lang.ClassNotFoundException: SMTP - # testmessage: - # send: false - # subject: "Outbound SMTP" - # text: "The Outbound SMTP email subsystem is working." - # to: - -imap: - server: - enabled: false - host: "0.0.0.0" - port: 1143 - imap: - enabled: true - imaps: - enabled: true - port: 1144 - mail: - from: - default: - to: - default: - -metadataKeystore: - # keystorePassword: "" - # keyPassword: "" - defaultKeystorePassword: "mp6yc0UD9e" - defaultKeyPassword: "mp6yc0UD9e" alfresco-sync-service: syncservice: - enabled : true image: - repository: quay.io/alfresco/service-sync tag: 3.3.4.1 - -# If there is a need to pull images from a private docker repo, a secret can be defined in helm and passed as an argument -# to the install command: -# e.g.: helm install alfresco-content-services --set global.alfrescoRegistryPullSecrets=quay-registry-secret -# or uncomment the following line if you don't want/need to pass it as a parameter on every install command : -# global.alfrescoRegistryPullSecrets: quay-registry-secret -# for more information: https://github.com/Alfresco/alfresco-anaxes-shipyard/blob/master/SECRETS.md - -# Global definition of Docker registry pull secret which can be accessed by dependent ACS Helm chart(s) -global: - alfrescoRegistryPullSecrets: - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - registryPullSecrets: - - quay-registry-secret diff --git a/helm/alfresco-content-services/7.0.N_values.yaml b/helm/alfresco-content-services/7.0.N_values.yaml index 6bb9401cd..5d40a6a85 100644 --- a/helm/alfresco-content-services/7.0.N_values.yaml +++ b/helm/alfresco-content-services/7.0.N_values.yaml @@ -2,68 +2,57 @@ repository: image: - repository: quay.io/alfresco/alfresco-content-repository tag: 7.0.1 -ooiService: - image: - repository: quay.io/alfresco/alfresco-ooi-service - tag: 1.1.1 - transformrouter: image: - repository: quay.io/alfresco/alfresco-transform-router tag: 1.4.1 pdfrenderer: image: - repository: alfresco/alfresco-pdf-renderer tag: 2.5.1 imagemagick: image: - repository: alfresco/alfresco-imagemagick tag: 2.5.1 libreoffice: image: - repository: alfresco/alfresco-libreoffice tag: 2.5.1 tika: image: - repository: alfresco/alfresco-tika tag: 2.5.1 transformmisc: image: - repository: alfresco/alfresco-transform-misc tag: 2.5.1 aiTransformer: image: - repository: quay.io/alfresco/alfresco-ai-docker-engine tag: 1.4.0 filestore: image: - repository: quay.io/alfresco/alfresco-shared-file-store tag: 0.16.0 share: image: - repository: quay.io/alfresco/alfresco-share tag: 7.0.1 alfresco-search: searchServicesImage: tag: 2.0.2 -alfresco-digital-workspace: +postgresql: image: - repository: quay.io/alfresco/alfresco-digital-workspace - tag: 2.4.2-adw + tag: 13.1.0 -postgresql: +postgresql-syncservice: image: tag: 13.1.0 + +alfresco-sync-service: + syncservice: + image: + tag: 3.4.0 diff --git a/helm/alfresco-content-services/7.1.N_values.yaml b/helm/alfresco-content-services/7.1.N_values.yaml new file mode 100644 index 000000000..0ee57dc10 --- /dev/null +++ b/helm/alfresco-content-services/7.1.N_values.yaml @@ -0,0 +1,50 @@ +# This is a YAML-formatted file. Declare variables to be passed into your templates. + +repository: + image: + tag: 7.1.0.1 + +transformrouter: + image: + tag: 1.4.1 + +pdfrenderer: + image: + tag: 2.5.3 + +imagemagick: + image: + tag: 2.5.3 + +libreoffice: + image: + tag: 2.5.3 + +tika: + image: + tag: 2.5.3 + +transformmisc: + image: + tag: 2.5.3 + +aiTransformer: + image: + tag: 1.4.0 + +filestore: + image: + tag: 0.16.0 + +share: + image: + tag: 7.1.0.1 + +alfresco-search: + searchServicesImage: + tag: 2.0.2 + +alfresco-sync-service: + syncservice: + image: + tag: 3.4.0 diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index d53e93026..34d7d053d 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -3,7 +3,7 @@ # Request an extended 30-day trial at https://www.alfresco.com/platform/content-services-ecm/trial/download apiVersion: v2 name: alfresco-content-services -version: 5.1.1 +version: 5.2.0-M1 description: A Helm chart for deploying Alfresco Content Services keywords: - content @@ -15,18 +15,18 @@ sources: - https://github.com/Alfresco/acs-deployment dependencies: - name: postgresql - version: 10.4.5 + version: 10.13.9 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: postgresql - version: 10.4.5 + version: 10.13.9 repository: https://charts.bitnami.com/bitnami alias: postgresql-syncservice condition: alfresco-sync-service.syncservice.enabled,postgresql-syncservice.enabled - name: common alias: alfresco-digital-workspace repository: https://activiti.github.io/activiti-cloud-helm-charts - version: 7.1.0-M15 + version: 7.1.0-M16 condition: alfresco-content-services.alfresco-digital-workspace.enabled,alfresco-digital-workspace.enabled - name: activemq version: 2.0.0 diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 3ca3489bc..29d04618b 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -8,7 +8,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b A Helm chart for deploying Alfresco Content Services -![Version: 5.1.1](https://img.shields.io/badge/Version-5.1.1-informational?style=flat-square) +![Version: 5.2.0-M1](https://img.shields.io/badge/Version-5.2.0--M1-informational?style=flat-square) ## Requirements @@ -17,9 +17,9 @@ A Helm chart for deploying Alfresco Content Services | | activemq | 2.0.0 | | | alfresco-search | 1.0.4 | | | alfresco-sync-service | 3.0.9 | -| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-digital-workspace(common) | 7.1.0-M15 | -| https://charts.bitnami.com/bitnami | postgresql | 10.4.5 | -| https://charts.bitnami.com/bitnami | postgresql-syncservice(postgresql) | 10.4.5 | +| https://activiti.github.io/activiti-cloud-helm-charts | alfresco-digital-workspace(common) | 7.1.0-M16 | +| https://charts.bitnami.com/bitnami | postgresql | 10.13.9 | +| https://charts.bitnami.com/bitnami | postgresql-syncservice(postgresql) | 10.13.9 | ## Values @@ -62,7 +62,7 @@ Hence, setting up explicit Container memory and then assigning a percentage of i | alfresco-digital-workspace.extraEnv | string | `"{{- if .Values.global.ai.enabled }}\n- name: APP_CONFIG_PLUGIN_AI_SERVICE\n value: '{{ .Values.global.ai.enabled }}'\n{{- end }}"` | | | alfresco-digital-workspace.image.pullPolicy | string | `"IfNotPresent"` | | | alfresco-digital-workspace.image.repository | string | `"quay.io/alfresco/alfresco-digital-workspace"` | | -| alfresco-digital-workspace.image.tag | string | `"2.4.2-adw"` | | +| alfresco-digital-workspace.image.tag | string | `"2.5.0"` | | | alfresco-digital-workspace.ingress.annotations."nginx.ingress.kubernetes.io/proxy-body-size" | string | `"5g"` | | | alfresco-digital-workspace.ingress.path | string | `"/workspace"` | | | alfresco-digital-workspace.ingress.tls | list | `[]` | | @@ -84,6 +84,8 @@ Hence, setting up explicit Container memory and then assigning a percentage of i | alfresco-search.searchServicesImage.pullPolicy | string | `"IfNotPresent"` | | | alfresco-search.searchServicesImage.tag | string | `"2.0.2"` | | | alfresco-search.type | string | `"search-services"` | | +| alfresco-sync-service.image.repository | string | `"quay.io/alfresco/service-sync"` | | +| alfresco-sync-service.image.tag | string | `"3.5.0-M1"` | | | alfresco-sync-service.syncservice.enabled | bool | `true` | | | apiexplorer | object | `{"ingress":{"path":"/api-explorer"}}` | Declares the api-explorer service used by the content repository | | database | object | `{"driver":null,"external":false,"password":null,"url":null,"user":null}` | Defines properties required by alfresco for connecting to the database Note! : If you set database.external to true you will have to setup the driver, user, password and JdbcUrl Also make sure that the container has the db driver in /usr/local/tomcat/lib since the current image only has the postgresql driver | @@ -91,9 +93,9 @@ Hence, setting up explicit Container memory and then assigning a percentage of i | database.password | string | `nil` | ex: alfresco | | database.url | string | `nil` | ex: jdbc:postgresql://oldfashioned-mule-postgresql-acs:5432/alfresco | | database.user | string | `nil` | ex: alfresco | -| email | object | `{"handler":{"folder":{"overwriteDuplicates":true}},"inbound":{"emailContributorsAuthority":"EMAIL_CONTRIBUTORS","enabled":false,"unknownUser":"anonymous"},"initContainers":{"pemToKeystore":{"image":{"pullPolicy":"IfNotPresent","repository":"registry.access.redhat.com/redhat-sso-7/sso71-openshift","tag":"1.1-16"}},"pemToTruststore":{"image":{"pullPolicy":"IfNotPresent","repository":"registry.access.redhat.com/redhat-sso-7/sso71-openshift","tag":"1.1-16"}},"setPerms":{"image":{"pullPolicy":"IfNotPresent","repository":"busybox","tag":"1.33.1"}}},"server":{"allowed":{"senders":".*"},"auth":{"enabled":true},"blocked":{"senders":null},"connections":{"max":3},"domain":null,"enableTLS":true,"enabled":false,"hideTLS":false,"port":1125,"requireTLS":false},"ssl":{"secretName":null}}` | For a full information of properties on the email configuration, please view: https://docs.alfresco.com/6.2/concepts/email.html | +| email | object | `{"handler":{"folder":{"overwriteDuplicates":true}},"inbound":{"emailContributorsAuthority":"EMAIL_CONTRIBUTORS","enabled":false,"unknownUser":"anonymous"},"initContainers":{"pemToKeystore":{"image":{"pullPolicy":"IfNotPresent","repository":"registry.access.redhat.com/redhat-sso-7/sso71-openshift","tag":"1.1-16"}},"pemToTruststore":{"image":{"pullPolicy":"IfNotPresent","repository":"registry.access.redhat.com/redhat-sso-7/sso71-openshift","tag":"1.1-16"}},"setPerms":{"image":{"pullPolicy":"IfNotPresent","repository":"busybox","tag":"1.34.1"}}},"server":{"allowed":{"senders":".*"},"auth":{"enabled":true},"blocked":{"senders":null},"connections":{"max":3},"domain":null,"enableTLS":true,"enabled":false,"hideTLS":false,"port":1125,"requireTLS":false},"ssl":{"secretName":null}}` | For a full information of properties on the email configuration, please view: https://docs.alfresco.com/6.2/concepts/email.html | | email.server.enabled | bool | `false` | Enables the email server - see https://docs.alfresco.com/6.2/concepts/email-inboundsmtp-props.html | -| filestore | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80","scheduler.cleanup.interval":"86400000","scheduler.content.age.millis":"86400000"},"image":{"internalPort":8099,"pullPolicy":"IfNotPresent","repository":"quay.io/alfresco/alfresco-shared-file-store","tag":"0.16.0"},"initContainer":{"image":{"pullPolicy":"IfNotPresent","repository":"busybox","tag":"1.33.1"},"resources":{"limits":{"memory":"10Mi"},"requests":{"memory":"5Mi"}}},"livenessProbe":{"initialDelaySeconds":10,"livenessPercent":150,"livenessSavePeriodSeconds":600,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":20,"periodSeconds":60,"timeoutSeconds":10},"replicaCount":1,"resources":{"limits":{"memory":"1000Mi"},"requests":{"memory":"1000Mi"}},"service":{"externalPort":80,"name":"filestore","type":"ClusterIP"}}` | Declares the alfresco-shared-file-store used by the content repository and transform service | +| filestore | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80","scheduler.cleanup.interval":"86400000","scheduler.content.age.millis":"86400000"},"image":{"internalPort":8099,"pullPolicy":"IfNotPresent","repository":"quay.io/alfresco/alfresco-shared-file-store","tag":"0.16.0"},"initContainer":{"image":{"pullPolicy":"IfNotPresent","repository":"busybox","tag":"1.34.1"},"resources":{"limits":{"memory":"10Mi"},"requests":{"memory":"5Mi"}}},"livenessProbe":{"initialDelaySeconds":10,"livenessPercent":150,"livenessSavePeriodSeconds":600,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":20,"periodSeconds":60,"timeoutSeconds":10},"replicaCount":1,"resources":{"limits":{"memory":"1000Mi"},"requests":{"memory":"1000Mi"}},"service":{"externalPort":80,"name":"filestore","type":"ClusterIP"}}` | Declares the alfresco-shared-file-store used by the content repository and transform service | | global.ai | object | `{"enabled":false}` | Choose if you want AI capabilities (globally - including ADW AI plugin) | | global.alfrescoRegistryPullSecrets | string | `nil` | If there is a need to pull images from a private docker repo, a secret can be defined in helm and passed as an argument to the install command: e.g.: helm install alfresco-content-services --set global.alfrescoRegistryPullSecrets=quay-registry-secret or uncomment the following line if you don't want/need to pass it as a parameter on every install command : global.alfrescoRegistryPullSecrets: quay-registry-secret for more information: https://github.com/Alfresco/alfresco-anaxes-shipyard/blob/master/SECRETS.md -- Global definition of Docker registry pull secret which can be accessed by dependent ACS Helm chart(s) | | global.registryPullSecrets[0] | string | `"quay-registry-secret"` | | @@ -170,7 +172,7 @@ Hence, setting up explicit Container memory and then assigning a percentage of i | pdfrenderer | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-pdf-renderer","tag":"2.5.3"},"livenessProbe":{"initialDelaySeconds":10,"livenessPercent":150,"livenessTransformPeriodSeconds":600,"maxTransformSeconds":1200,"maxTransforms":10000,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":20,"periodSeconds":60,"timeoutSeconds":10},"replicaCount":2,"resources":{"limits":{"memory":"1000Mi"},"requests":{"memory":"1000Mi"}},"service":{"externalPort":80,"name":"pdfrenderer","type":"ClusterIP"}}` | Declares the alfresco-pdf-renderer service used by the content repository to transform pdf files | | persistence | object | `{"baseSize":"20Gi","chownWithDynamicProvisioning":false,"enabled":true,"existingClaim":"alfresco-volume-claim","filestore":{"data":{"mountPath":"/tmp/Alfresco","subPath":"alfresco-content-services/filestore-data"},"enabled":true},"repository":{"config":{"querysetsMountPath":"/usr/local/tomcat/shared/classes/alfresco/extension/querysets/","transform":{"mimetypesMountPath":"/usr/local/tomcat/shared/classes/alfresco/extension/mimetypes/","pipelinesMountPath":"/usr/local/tomcat/shared/classes/alfresco/extension/transform/pipelines/","renditionsMountPath":"/usr/local/tomcat/shared/classes/alfresco/extension/transform/renditions/"}},"data":{"mountPath":"/usr/local/tomcat/alf_data","subPath":"alfresco-content-services/repository-data"},"enabled":true},"storageClass":{"accessModes":["ReadWriteMany"],"enabled":false,"name":"nfs"}}` | Defines the mounting points for the persistence required by the apps in the cluster the alf_data folder from alfresco-content-repository app is mapped to alfresco-content-services/repository-data | | persistence.storageClass | object | `{"accessModes":["ReadWriteMany"],"enabled":false,"name":"nfs"}` | Enable and define if you already have a custom storage class defined | -| persistence.storageClass.name | string | `"nfs"` | Custom storage classs name | +| persistence.storageClass.name | string | `"nfs"` | Custom storage class name | | postgresql | object | `{"commonAnnotations":{"application":"alfresco-content-services"},"enabled":true,"image":{"pullPolicy":"IfNotPresent","tag":"13.3.0"},"nameOverride":"postgresql-acs","persistence":{"existingClaim":"alfresco-volume-claim","subPath":"alfresco-content-services/database-data"},"postgresqlDatabase":"alfresco","postgresqlExtendedConf":{"log_min_messages":"LOG","max_connections":300},"postgresqlPassword":"alfresco","postgresqlUsername":"alfresco","replicaCount":1,"resources":{"limits":{"memory":"1500Mi"},"requests":{"memory":"1500Mi"}}}` | Defines the properties to be used for the required postgres DB Note: the database (tables) information is also saved in the persistent volume claim | | postgresql-syncservice.commonAnnotations.application | string | `"alfresco-content-services"` | | | postgresql-syncservice.enabled | bool | `true` | | @@ -194,8 +196,8 @@ Hence, setting up explicit Container memory and then assigning a percentage of i | repository.adminPassword | string | `"209c6174da490caeb422f3fa5a7ae634"` | Administrator password for ACS in md5 hash format | | repository.command | list | `[]` | | | repository.edition | string | `"Enterprise"` | | -| repository.environment.JAVA_OPTS | string | `" -Dsolr.base.url=/solr -Dsolr.secureComms=none -Dindex.subsystem.name=solr6 -Dalfresco.cluster.enabled=true -Ddeployment.method=HELM_CHART -Dtransform.service.enabled=true -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"` | | -| repository.environment.JAVA_TOOL_OPTIONS | string | `" -Dencryption.keystore.type=JCEKS -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding -Dencryption.keyAlgorithm=DESede -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.algorithm=DESede"` | | +| repository.environment.JAVA_OPTS | string | `" -Dsolr.base.url=/solr -Dsolr.secureComms=none -Dindex.subsystem.name=solr6 -Dalfresco.cluster.enabled=true -Ddeployment.method=HELM_CHART -Dtransform.service.enabled=true -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 "` | | +| repository.environment.JAVA_TOOL_OPTIONS | string | `" -Dencryption.keystore.type=JCEKS -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding -Dencryption.keyAlgorithm=DESede -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.algorithm=DESede "` | | | repository.extraInitContainers | list | `[]` | | | repository.extraLogStatements | object | `{}` | Provide additional log statements by adding classes and/or packages in a key:value fashion | | repository.extraSideContainers | list | `[]` | | @@ -205,19 +207,19 @@ Hence, setting up explicit Container memory and then assigning a percentage of i | repository.image.internalPort | int | `8080` | | | repository.image.pullPolicy | string | `"IfNotPresent"` | | | repository.image.repository | string | `"quay.io/alfresco/alfresco-content-repository"` | | -| repository.image.tag | string | `"7.1.0.1"` | | +| repository.image.tag | string | `"7.2.0-M1"` | | | repository.ingress.annotations | object | `{}` | | | repository.ingress.maxUploadSize | string | `"5g"` | | | repository.ingress.path | string | `"/"` | | | repository.ingress.tls | list | `[]` | | | repository.initContainers.db.image.pullPolicy | string | `"IfNotPresent"` | | | repository.initContainers.db.image.repository | string | `"busybox"` | | -| repository.initContainers.db.image.tag | string | `"1.33.1"` | | +| repository.initContainers.db.image.tag | string | `"1.34.1"` | | | repository.initContainers.db.resources.limits.memory | string | `"10Mi"` | | | repository.initContainers.db.resources.requests.memory | string | `"5Mi"` | | | repository.initContainers.fs.image.pullPolicy | string | `"IfNotPresent"` | | | repository.initContainers.fs.image.repository | string | `"busybox"` | | -| repository.initContainers.fs.image.tag | string | `"1.33.1"` | | +| repository.initContainers.fs.image.tag | string | `"1.34.1"` | | | repository.initContainers.fs.resources.limits.memory | string | `"10Mi"` | | | repository.initContainers.fs.resources.requests.memory | string | `"5Mi"` | | | repository.livenessProbe.initialDelaySeconds | int | `130` | | @@ -232,7 +234,7 @@ Hence, setting up explicit Container memory and then assigning a percentage of i | repository.service.type | string | `"ClusterIP"` | | | repository.strategy.type | string | `"Recreate"` | | | s3connector | object | `{"enabled":false}` | Defines the properties to be used for the S3 Connector For a full list of properties on the S3 connector, please view: https://docs.alfresco.com/s3connector/references/s3-contentstore-ref-config-props.html | -| share | object | `{"command":[],"environment":{"CATALINA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"extraInitContainers":[],"extraSideContainers":[],"extraVolumeMounts":[],"extraVolumes":[],"image":{"internalPort":8080,"pullPolicy":"IfNotPresent","repository":"quay.io/alfresco/alfresco-share","tag":"7.1.0.1"},"ingress":{"annotations":{},"path":"/share","tls":[]},"livenessProbe":{"initialDelaySeconds":200,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":60,"periodSeconds":20,"timeoutSeconds":15},"replicaCount":1,"resources":{"limits":{"memory":"2000Mi"},"requests":{"memory":"2000Mi"}},"service":{"externalPort":80,"name":"share","type":"ClusterIP"}}` | Define the alfresco-share properties to use in the k8s cluster This is the default presentation layer(UI) of Alfresco Content Services | +| share | object | `{"command":[],"environment":{"CATALINA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"extraInitContainers":[],"extraSideContainers":[],"extraVolumeMounts":[],"extraVolumes":[],"image":{"internalPort":8080,"pullPolicy":"IfNotPresent","repository":"quay.io/alfresco/alfresco-share","tag":"7.2.0-M1"},"ingress":{"annotations":{},"path":"/share","tls":[]},"livenessProbe":{"initialDelaySeconds":200,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":60,"periodSeconds":20,"timeoutSeconds":15},"replicaCount":1,"resources":{"limits":{"memory":"2000Mi"},"requests":{"memory":"2000Mi"}},"service":{"externalPort":80,"name":"share","type":"ClusterIP"}}` | Define the alfresco-share properties to use in the k8s cluster This is the default presentation layer(UI) of Alfresco Content Services | | tika | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-tika","tag":"2.5.3"},"livenessProbe":{"initialDelaySeconds":60,"livenessPercent":400,"livenessTransformPeriodSeconds":600,"maxTransformSeconds":1800,"maxTransforms":10000,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":60,"periodSeconds":60,"timeoutSeconds":10},"replicaCount":2,"resources":{"limits":{"memory":"1000Mi"},"requests":{"memory":"1000Mi"}},"service":{"externalPort":80,"name":"tika","type":"ClusterIP"}}` | Declares the alfresco-tika service used by the content repository to transform office files | | transformmisc | object | `{"enabled":true,"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-transform-misc","tag":"2.5.3"},"livenessProbe":{"initialDelaySeconds":10,"livenessPercent":400,"livenessTransformPeriodSeconds":600,"maxTransformSeconds":1800,"maxTransforms":10000,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":20,"periodSeconds":60,"timeoutSeconds":10},"replicaCount":2,"resources":{"limits":{"memory":"1000Mi"},"requests":{"memory":"1000Mi"}},"service":{"externalPort":80,"name":"transformmisc","type":"ClusterIP"}}` | Declares the alfresco-tika service used by the content repository to transform office files | | transformrouter.environment.JAVA_OPTS | string | `" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"` | | diff --git a/helm/alfresco-content-services/charts/activemq/templates/svc-activemq-web-console.yaml b/helm/alfresco-content-services/charts/activemq/templates/svc-activemq-web-console.yaml index f88747ee6..b5809e88f 100755 --- a/helm/alfresco-content-services/charts/activemq/templates/svc-activemq-web-console.yaml +++ b/helm/alfresco-content-services/charts/activemq/templates/svc-activemq-web-console.yaml @@ -18,4 +18,4 @@ spec: selector: app: {{ template "activemq.fullname" . }} release: {{ .Release.Name }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/charts/alfresco-search/charts/alfresco-insight-zeppelin/templates/_helpers.tpl b/helm/alfresco-content-services/charts/alfresco-search/charts/alfresco-insight-zeppelin/templates/_helpers.tpl index 2671e69ce..67a067ead 100755 --- a/helm/alfresco-content-services/charts/alfresco-search/charts/alfresco-insight-zeppelin/templates/_helpers.tpl +++ b/helm/alfresco-content-services/charts/alfresco-search/charts/alfresco-insight-zeppelin/templates/_helpers.tpl @@ -18,4 +18,4 @@ Get Alfresco Repo Host */}} {{- define "alfresco-repo-host" -}} {{- printf "%s-%s-%s" .Release.Name .Values.repository.host "repository" -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/helm/alfresco-content-services/charts/alfresco-search/templates/NOTES.txt b/helm/alfresco-content-services/charts/alfresco-search/templates/NOTES.txt index c5d7adb23..90a207e98 100755 --- a/helm/alfresco-content-services/charts/alfresco-search/templates/NOTES.txt +++ b/helm/alfresco-content-services/charts/alfresco-search/templates/NOTES.txt @@ -11,4 +11,4 @@ You can access Alfresco Search using: If you have a specific DNS address for the cluster please run the following commands to get the application paths and configure ACS: helm upgrade --reuse-values {{ .Release.Name }} --set externalProtocol="http" --set externalHost="domain.com" --set externalPort="80" alfresco/alfresco-content-services -{{ end }} \ No newline at end of file +{{ end }} diff --git a/helm/alfresco-content-services/charts/alfresco-search/templates/_helpers.tpl b/helm/alfresco-content-services/charts/alfresco-search/templates/_helpers.tpl index a2481704a..198f986b3 100755 --- a/helm/alfresco-content-services/charts/alfresco-search/templates/_helpers.tpl +++ b/helm/alfresco-content-services/charts/alfresco-search/templates/_helpers.tpl @@ -61,4 +61,4 @@ Get Alfresco Search Docker Image {{- else }} {{- printf "%s:%s" .Values.searchServicesImage.repository .Values.searchServicesImage.tag -}} {{- end }} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/helm/alfresco-content-services/charts/alfresco-search/templates/config.yaml b/helm/alfresco-content-services/charts/alfresco-search/templates/config.yaml index 072ee200a..58d1f3c80 100755 --- a/helm/alfresco-content-services/charts/alfresco-search/templates/config.yaml +++ b/helm/alfresco-content-services/charts/alfresco-search/templates/config.yaml @@ -18,4 +18,4 @@ data: {{- range $key, $val := .Values.environment }} {{ $key }}: {{ $val | quote }} {{- end }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/helm/alfresco-content-services/charts/alfresco-search/templates/secrets.yaml b/helm/alfresco-content-services/charts/alfresco-search/templates/secrets.yaml index 95c43b4ce..783644703 100755 --- a/helm/alfresco-content-services/charts/alfresco-search/templates/secrets.yaml +++ b/helm/alfresco-content-services/charts/alfresco-search/templates/secrets.yaml @@ -9,4 +9,4 @@ metadata: type: Opaque data: auth: {{ .Values.ingress.basicAuth | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/charts/alfresco-search/templates/service.yaml b/helm/alfresco-content-services/charts/alfresco-search/templates/service.yaml index 7d5538637..549fdca26 100755 --- a/helm/alfresco-content-services/charts/alfresco-search/templates/service.yaml +++ b/helm/alfresco-content-services/charts/alfresco-search/templates/service.yaml @@ -16,4 +16,4 @@ spec: name: {{ .Values.service.name }} selector: app: {{ template "alfresco-search.fullName" . }}-solr - release: {{ .Release.Name }} \ No newline at end of file + release: {{ .Release.Name }} diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/README.md b/helm/alfresco-content-services/charts/alfresco-sync-service/README.md index c36488b85..1fd69069e 100644 --- a/helm/alfresco-content-services/charts/alfresco-sync-service/README.md +++ b/helm/alfresco-content-services/charts/alfresco-sync-service/README.md @@ -40,7 +40,6 @@ Alfresco Sync Service | postgresql-syncservice.image.tag | string | `"11.7.0"` | | | postgresql-syncservice.name | string | `"postgresql-syncservice"` | If true, install the postgresql chart alongside Alfresco Sync service. Note: Set this to false if you use an external database. | | postgresql-syncservice.nameOverride | string | `"postgresql-syncservice"` | | -| postgresql-syncservice.persistence.storageClass | string | `"gp2"` | | | postgresql-syncservice.postgresConfig.log_min_messages | string | `"LOG"` | | | postgresql-syncservice.postgresConfig.max_connections | int | `450` | | | postgresql-syncservice.postgresqlDatabase | string | `"syncservice-postgresql"` | | diff --git a/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml b/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml index 8be564707..bae1f3f83 100755 --- a/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml +++ b/helm/alfresco-content-services/charts/alfresco-sync-service/values.yaml @@ -98,9 +98,6 @@ postgresql-syncservice: image: tag: 11.7.0 pullPolicy: IfNotPresent - persistence: - storageClass: gp2 - #subPath: "ent-featureappsrepo470-9/alfresco-sync-services/database-data" postgresqlUsername: alfresco postgresqlPassword: admin postgresqlDatabase: syncservice-postgresql diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index 24163aea8..43fd499c2 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -3,406 +3,31 @@ # ACS will be created in a k8s cluster with a minimum of 16GB memory to split among below nodes: # 1 x repository, 1 x share, 1 x transformers (pdfrenderer, imagemagick, libreoffice, tika, misc) and 1 x postgresql -# Limit container memory and assign X percentage to JVM. There are couple of ways to allocate JVM Memory for ACS Containers -# For example: 'JAVA_OPTS: "$JAVA_OPTS -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"' -# But, as per Oracle docs (https://docs.oracle.com/javase/9/gctuning/parallel-collector1.htm#JSGCT-GUID-CAB83393-3438-44ED-98F0-D15641B43C7D) -# If container memory is not explicitly set, then the above flags will default max heap to 1/4th of container's memory which may not be ideal. -# Hence, setting up explicit Container memory and then assigning a percentage of it to the JVM for performance tuning. - repository: edition: Community replicaCount: 1 - strategy: - type: Recreate image: repository: alfresco/alfresco-content-repository-community - tag: 7.1.0.1 - pullPolicy: IfNotPresent - internalPort: 8080 - hazelcastPort: 5701 - initContainers: - db: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - resources: - requests: - memory: "5Mi" - limits: - memory: "10Mi" - fs: - image: - repository: busybox - tag: 1.33.1 - pullPolicy: IfNotPresent - resources: - requests: - memory: "5Mi" - limits: - memory: "10Mi" - service: - name: alfresco - type: ClusterIP - externalPort: &repositoryExternalPort 80 - ingress: - path: / - maxUploadSize: "5g" - annotations: {} - # nginx.ingress.kubernetes.io/enable-cors: "true" - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - environment: - JAVA_OPTS: " -Dsolr.base.url=/solr - -Dsolr.secureComms=none - -Dindex.subsystem.name=solr6 - -Ddeployment.method=HELM_CHART - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - JAVA_TOOL_OPTIONS: " -Dencryption.keystore.type=JCEKS - -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding - -Dencryption.keyAlgorithm=DESede - -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore - -Dmetadata-keystore.aliases=metadata - -Dmetadata-keystore.metadata.algorithm=DESede" - resources: - requests: - memory: "3000Mi" - limits: - memory: "3000Mi" - # The repository readiness probe is used to check startup only as a failure - # of the liveness probe later will result in the pod being restarted. - readinessProbe: - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - failureThreshold: 6 - livenessProbe: - initialDelaySeconds: 130 - periodSeconds: 20 - timeoutSeconds: 10 - -# Declares the api-explorer service used by the content repository -apiexplorer: - ingress: - path: /api-explorer - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local -# Declares the alfresco-pdf-renderer service used by the content repository -# to transform pdf files pdfrenderer: replicaCount: 1 - image: - repository: alfresco/alfresco-pdf-renderer - tag: 2.5.3 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: pdfrenderer - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 150 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1200 -# Declares the alfresco-imagemagick service used by the content repository -# to transform image files imagemagick: replicaCount: 1 - image: - repository: alfresco/alfresco-imagemagick - tag: 2.5.3 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: imagemagick - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 150 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 900 -# Declares the alfresco-libreoffice service used by the content repository -# to transform office files libreoffice: replicaCount: 1 - image: - repository: alfresco/alfresco-libreoffice - tag: 2.5.3 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: libreoffice - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 250 - livenessTransformPeriodSeconds: 600 - maxTransforms: 99999 - maxTransformSeconds: 1800 -# Declares the alfresco-tika service used by the content repository -# to transform office files tika: replicaCount: 1 - image: - repository: alfresco/alfresco-tika - tag: 2.5.3 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: tika - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 400 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1800 -# Declares the alfresco-tika service used by the content repository -# to transform office files transformmisc: - enabled: true replicaCount: 1 - image: - repository: alfresco/alfresco-transform-misc - tag: 2.5.3 - pullPolicy: IfNotPresent - internalPort: 8090 - service: - name: transformmisc - type: ClusterIP - externalPort: 80 - resources: - requests: - memory: "1000Mi" - limits: - memory: "1000Mi" - environment: - JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 60 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 10 - periodSeconds: 20 - timeoutSeconds: 10 - livenessPercent: 400 - livenessTransformPeriodSeconds: 600 - maxTransforms: 10000 - maxTransformSeconds: 1800 -# Define the alfresco-share properties to use in the k8s cluster -# This is the default presentation layer(UI) of Alfresco Content Services share: replicaCount: 1 image: repository: alfresco/alfresco-share - tag: 7.1.0.1 - pullPolicy: IfNotPresent - internalPort: 8080 - service: - name: share - type: ClusterIP - externalPort: 80 - ingress: - path: /share - annotations: {} - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - resources: - requests: - memory: "2000Mi" - limits: - memory: "2000Mi" - environment: - CATALINA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - readinessProbe: - initialDelaySeconds: 60 - periodSeconds: 20 - timeoutSeconds: 10 - livenessProbe: - initialDelaySeconds: 130 - periodSeconds: 20 - timeoutSeconds: 10 - -# Defines the mounting points for the persistence required by the apps in the -# cluster the alf_data folder from alfresco-content-repository app is mapped to -# alfresco-content-services/repository-data -persistence: - enabled: true - baseSize: 20Gi - storageClass: #enable and define if you already have a custom storage class defined - enabled: false - accessModes: - - ReadWriteMany - name: "nfs" #Custom storage classs name - existingClaim: "alfresco-volume-claim" - repository: - enabled: true - config: - querysetsMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/querysets/" - transform: - renditionsMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/transform/renditions/" - pipelinesMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/transform/pipelines/" - mimetypesMountPath: "/usr/local/tomcat/shared/classes/alfresco/extension/mimetypes/" - data: - mountPath: "/usr/local/tomcat/alf_data" - subPath: "alfresco-content-services/repository-data" - filestore: - enabled: true - data: - mountPath: "/tmp/Alfresco" - subPath: "alfresco-content-services/filestore-data" - -activemq: - enabled: true - -alfresco-search: - type: "search-services" - enabled: true -# If enabled is set to false, then external host and port need to point to the external instance of SOLR6, and in this case: -# Note: Rule_05-network-policy-search will be disabled. -# Note: Rule_04-network-policy-repository internal trafic to SOLR6 instance will be disabled. -# Note: ingress-repository will not block external trafic to */solr/* -# external: - # Host dns/ip of the external solr6 instance. -# host: "127.0.0.1" - # Port of the external solr6 instance. -# port: "8983" - searchServicesImage: - tag: 2.0.2 - repository: &repositoryHostPort - # The value for "host" is the name of this chart - host: alfresco-cs - port: *repositoryExternalPort - alfresco-insight-zeppelin: - insightzeppelin: - enabled: false - repository: *repositoryHostPort - ingress: - # Alfresco Search services endpoint ('/solr') is disabled by default - # To enable it please see: acs-deployment configuration table](https://github.com/Alfresco/acs-deployment/tree/master/helm/alfresco-content-services#configuration) - enabled: false - # Default solr basic auth user/password: admin / admin - # You can create your own with htpasswd utilility & encode it with base640. - # Example: `echo -n "$(htpasswd -nbm admin admin)" | base64` # i.e. admin / admin - # basicAuth: YWRtaW46JGFwcjEkVVJqb29uS00kSEMuS1EwVkRScFpwSHB2a3JwTDd1Lg== - basicAuth: - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -# Defines properties required by alfresco for connecting to the database -# Note! : If you set database.external to true you will have to setup the driver, user, password and JdbcUrl -# Also make sure that the container has the db driver in /usr/local/tomcat/lib since the current image only has the postgresql driver -database: - external: false - # driver: #ex: org.postgresql.Driver - # user: #ex: alfresco - # password: #ex: alfresco - # url: # ex: jdbc:postgresql://oldfashioned-mule-postgresql-acs:5432/alfresco - -# Defines the properties to be used for the required postgres DB -# Note: the database (tables) information is also saved in the persistent volume claim -postgresql: - replicaCount: 1 - ## If true, install the postgresql chart alongside Alfresco Content Services. - # Note: Set this to false if you use an external database. - enabled: true - nameOverride: postgresql-acs - image: - tag: 13.1.0 - pullPolicy: IfNotPresent - postgresqlUsername: alfresco - postgresqlPassword: alfresco - postgresqlDatabase: alfresco - postgresqlExtendedConf: - max_connections: 300 - log_min_messages: LOG - persistence: - existingClaim: "alfresco-volume-claim" - subPath: "alfresco-content-services/database-data" - resources: - requests: - memory: "1500Mi" - limits: - memory: "1500Mi" - -metadataKeystore: - # keystorePassword: "" - # keyPassword: "" - defaultKeystorePassword: "mp6yc0UD9e" - defaultKeyPassword: "oKIWzVdEdA" # Disable features alfresco-digital-workspace: @@ -424,14 +49,3 @@ email: imap: server: enabled: false - -# If there is a need to pull images from a private docker repo, a secret can be defined in helm and passed as an argument -# to the install command: -# e.g.: helm install alfresco-content-services --set global.alfrescoRegistryPullSecrets=quay-registry-secret -# or uncomment the following line if you don't want/need to pass it as a parameter on every install command : -# global.alfrescoRegistryPullSecrets: quay-registry-secret -# for more information: https://github.com/Alfresco/alfresco-anaxes-shipyard/blob/master/SECRETS.md - -# Global definition of Docker registry pull secret which can be accessed by dependent ACS Helm chart(s) -global: - alfrescoRegistryPullSecrets: diff --git a/helm/alfresco-content-services/templates/_helpers-ai-transformer.tpl b/helm/alfresco-content-services/templates/_helpers-ai-transformer.tpl index 1656e1059..01174eb31 100644 --- a/helm/alfresco-content-services/templates/_helpers-ai-transformer.tpl +++ b/helm/alfresco-content-services/templates/_helpers-ai-transformer.tpl @@ -9,4 +9,3 @@ chart: {{ include "content-services.chart" . }} {{ include "ai-transformer.selectorLabels" . }} heritage: {{ .Release.Service }} {{- end }} - diff --git a/helm/alfresco-content-services/templates/config-filestore.yaml b/helm/alfresco-content-services/templates/config-filestore.yaml index 3c22a3162..b930e2e94 100644 --- a/helm/alfresco-content-services/templates/config-filestore.yaml +++ b/helm/alfresco-content-services/templates/config-filestore.yaml @@ -15,4 +15,4 @@ data: {{- end }} livenessPercent: "{{ .Values.filestore.livenessProbe.livenessPercent }}" livenessSavePeriodSeconds: "{{ .Values.filestore.livenessProbe.livenessSavePeriodSeconds }}" -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/templates/config-transform-misc.yaml b/helm/alfresco-content-services/templates/config-transform-misc.yaml index b7a80aa4b..1c1cef772 100644 --- a/helm/alfresco-content-services/templates/config-transform-misc.yaml +++ b/helm/alfresco-content-services/templates/config-transform-misc.yaml @@ -27,4 +27,4 @@ data: livenessTransformPeriodSeconds: "{{ .Values.transformmisc.livenessProbe.livenessTransformPeriodSeconds }}" maxTransforms: "{{ .Values.transformmisc.livenessProbe.maxTransforms }}" maxTransformSeconds: "{{ .Values.transformmisc.livenessProbe.maxTransformSeconds }}" -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/templates/deployment-share.yaml b/helm/alfresco-content-services/templates/deployment-share.yaml index aac2a7db4..b1d214045 100644 --- a/helm/alfresco-content-services/templates/deployment-share.yaml +++ b/helm/alfresco-content-services/templates/deployment-share.yaml @@ -75,4 +75,3 @@ spec: volumes: {{ toYaml .Values.share.extraVolumes | indent 6 }} {{- end }} - diff --git a/helm/alfresco-content-services/templates/deployment-transform-misc.yaml b/helm/alfresco-content-services/templates/deployment-transform-misc.yaml index 225278632..e92783966 100644 --- a/helm/alfresco-content-services/templates/deployment-transform-misc.yaml +++ b/helm/alfresco-content-services/templates/deployment-transform-misc.yaml @@ -76,4 +76,4 @@ spec: periodSeconds: {{ .Values.transformmisc.livenessProbe.periodSeconds }} failureThreshold: 1 timeoutSeconds: {{ .Values.transformmisc.livenessProbe.timeoutSeconds }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/templates/deployment-transform-router.yaml b/helm/alfresco-content-services/templates/deployment-transform-router.yaml index 84c57ab9b..5d304ac86 100644 --- a/helm/alfresco-content-services/templates/deployment-transform-router.yaml +++ b/helm/alfresco-content-services/templates/deployment-transform-router.yaml @@ -84,4 +84,4 @@ spec: configMap: name: {{ template "alfresco.shortname" . }}-transform-routes-configmap {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/templates/ingress-ooi-service.yaml b/helm/alfresco-content-services/templates/ingress-ooi-service.yaml index dbe07c680..07f26994b 100755 --- a/helm/alfresco-content-services/templates/ingress-ooi-service.yaml +++ b/helm/alfresco-content-services/templates/ingress-ooi-service.yaml @@ -1,3 +1,4 @@ +{{- if .Values.ooi.enabled }} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} @@ -38,3 +39,4 @@ spec: backend: serviceName: {{ template "content-services.shortname" . }}-ooi-service servicePort: {{ .Values.ooiService.service.externalPort }} +{{- end }} diff --git a/helm/alfresco-content-services/templates/svc-filestore.yaml b/helm/alfresco-content-services/templates/svc-filestore.yaml index d48d6226c..33decea29 100644 --- a/helm/alfresco-content-services/templates/svc-filestore.yaml +++ b/helm/alfresco-content-services/templates/svc-filestore.yaml @@ -14,4 +14,4 @@ spec: name: {{ .Values.filestore.service.name }} selector: {{- include "filestore.selectorLabels" . | nindent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/templates/svc-transform-misc.yaml b/helm/alfresco-content-services/templates/svc-transform-misc.yaml index 7f53e9654..2d676acc4 100644 --- a/helm/alfresco-content-services/templates/svc-transform-misc.yaml +++ b/helm/alfresco-content-services/templates/svc-transform-misc.yaml @@ -14,4 +14,4 @@ spec: name: {{ .Values.transformmisc.service.name }} selector: {{- include "transform-misc.selectorLabels" . | nindent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/templates/svc-transform-router.yaml b/helm/alfresco-content-services/templates/svc-transform-router.yaml index 4c81b89a3..06fb8dfc2 100644 --- a/helm/alfresco-content-services/templates/svc-transform-router.yaml +++ b/helm/alfresco-content-services/templates/svc-transform-router.yaml @@ -14,4 +14,4 @@ spec: name: {{ .Values.transformrouter.service.name }} selector: {{- include "transform-router.selectorLabels" . | nindent 4 }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 5cac02a20..6b36b5e46 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -1,5 +1,14 @@ # This is a YAML-formatted file. Declare variables to be passed into your templates. +# ACS will be created in a k8s cluster with a minimum of 16GB memory to split among below nodes: +# 2 x repository, 1 x share, 1 x transformers (pdfrenderer, imagemagick, libreoffice, tika, misc) and 1 x postgresql + +# Limit container memory and assign X percentage to JVM. There are couple of ways to allocate JVM Memory for ACS Containers +# For example: 'JAVA_OPTS: "$JAVA_OPTS -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"' +# But, as per Oracle docs (https://docs.oracle.com/javase/9/gctuning/parallel-collector1.htm#JSGCT-GUID-CAB83393-3438-44ED-98F0-D15641B43C7D) +# If container memory is not explicitly set, then the above flags will default max heap to 1/4th of container's memory which may not be ideal. +# Hence, setting up explicit Container memory and then assigning a percentage of it to the JVM for performance tuning. + repository: # -- Administrator password for ACS in md5 hash format adminPassword: "209c6174da490caeb422f3fa5a7ae634" @@ -9,7 +18,7 @@ repository: type: Recreate image: repository: quay.io/alfresco/alfresco-content-repository - tag: 7.1.0.1 + tag: 7.2.0-M1 pullPolicy: IfNotPresent internalPort: 8080 hazelcastPort: 5701 @@ -17,7 +26,7 @@ repository: db: image: repository: busybox - tag: 1.33.1 + tag: 1.34.1 pullPolicy: IfNotPresent resources: requests: @@ -27,7 +36,7 @@ repository: fs: image: repository: busybox - tag: 1.33.1 + tag: 1.34.1 pullPolicy: IfNotPresent resources: requests: @@ -48,19 +57,23 @@ repository: # hosts: # - chart-example.local environment: - JAVA_OPTS: " -Dsolr.base.url=/solr + JAVA_OPTS: " + -Dsolr.base.url=/solr -Dsolr.secureComms=none -Dindex.subsystem.name=solr6 -Dalfresco.cluster.enabled=true -Ddeployment.method=HELM_CHART -Dtransform.service.enabled=true - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80" - JAVA_TOOL_OPTIONS: " -Dencryption.keystore.type=JCEKS + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + " + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding -Dencryption.keyAlgorithm=DESede -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore -Dmetadata-keystore.aliases=metadata - -Dmetadata-keystore.metadata.algorithm=DESede" + -Dmetadata-keystore.metadata.algorithm=DESede + " resources: requests: memory: "3000Mi" @@ -82,8 +95,7 @@ repository: extraSideContainers: [] extraInitContainers: [] command: [] - # -- Provide additional log statements by adding - # classes and/or packages in a key:value fashion + # -- Provide additional log statements by adding classes and/or packages in a key:value fashion extraLogStatements: {} # org.alfresco.repo.content.transform.TransformerDebug: debug # org.alfresco.repo.security.authentication.identityservice: debug @@ -412,7 +424,7 @@ filestore: initContainer: image: repository: busybox - tag: 1.33.1 + tag: 1.34.1 pullPolicy: IfNotPresent resources: requests: @@ -449,7 +461,7 @@ share: replicaCount: 1 image: repository: quay.io/alfresco/alfresco-share - tag: 7.1.0.1 + tag: 7.2.0-M1 pullPolicy: IfNotPresent internalPort: 8080 service: @@ -498,7 +510,7 @@ persistence: enabled: false accessModes: - ReadWriteMany - # -- Custom storage classs name + # -- Custom storage class name name: "nfs" existingClaim: "alfresco-volume-claim" repository: @@ -573,7 +585,7 @@ alfresco-digital-workspace: # - chart-example.local image: repository: quay.io/alfresco/alfresco-digital-workspace - tag: 2.4.2-adw + tag: 2.5.0 pullPolicy: IfNotPresent env: APP_CONFIG_AUTH_TYPE: "BASIC" @@ -726,7 +738,7 @@ email: setPerms: image: repository: busybox - tag: 1.33.1 + tag: 1.34.1 pullPolicy: IfNotPresent mail: @@ -783,6 +795,9 @@ metadataKeystore: alfresco-sync-service: syncservice: enabled : true + image: + repository: quay.io/alfresco/service-sync + tag: 3.5.0-M1 global: diff --git a/test/postman/docker-compose/acs-test-docker-compose-collection.json b/test/postman/docker-compose/acs-test-docker-compose-collection.json index b10d6ca21..8940e1cc5 100644 --- a/test/postman/docker-compose/acs-test-docker-compose-collection.json +++ b/test/postman/docker-compose/acs-test-docker-compose-collection.json @@ -1728,4 +1728,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/postman/helm/acs-test-helm-collection.json b/test/postman/helm/acs-test-helm-collection.json index 2f4d35592..5769670e7 100644 --- a/test/postman/helm/acs-test-helm-collection.json +++ b/test/postman/helm/acs-test-helm-collection.json @@ -2077,4 +2077,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/postman/helm/acs-validate-volume-collection.json b/test/postman/helm/acs-validate-volume-collection.json index a9f66f51e..f6f483fb5 100644 --- a/test/postman/helm/acs-validate-volume-collection.json +++ b/test/postman/helm/acs-validate-volume-collection.json @@ -650,4 +650,4 @@ } ], "protocolProfileBehavior": {} -} \ No newline at end of file +}