Skip to content

Commit

Permalink
ACS-2671 Update alfresco-ai-docker-engine to 1.4.2 (#680)
Browse files Browse the repository at this point in the history
  • Loading branch information
mteodori authored Mar 22, 2022
1 parent e7ed9c5 commit 51b4a6f
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ repos:
hooks:
- id: helm-docs
- repo: https://github.com/Alfresco/alfresco-build-tools
rev: v1.2.0
rev: v1.3.0
hooks:
- id: travis-yml-lint
- id: helm-deps
Expand Down
21 changes: 10 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,19 @@ stages:
if: branch = master OR commit_message = "[publish]"

import:
- source: Alfresco/alfresco-build-tools:.travis.awscli_install.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.aws-iam-authenticator_install.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.kubernetes_install.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.helm_install.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.kubepug_install.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.checkov_install.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.docker_login.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.helm-docs_install.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.yq_install.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.pre-commit.yml@v1.2.0
- source: Alfresco/alfresco-build-tools:.travis.awscli_install.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.aws-iam-authenticator_install.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.kubernetes_install.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.helm_install.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.kubepug_install.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.checkov_install.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.docker_login.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.helm-docs_install.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.yq_install.yml@v1.3.0
- source: Alfresco/alfresco-build-tools:.travis.pre-commit.yml@v1.3.0

env:
global:
- HELM_DOCS_VERSION=1.7.0
- HOSTED_ZONE=dev.envalfresco.com
- TRAVIS_WAIT_TIMEOUT=${TRAVIS_WAIT_TIMEOUT:-30}
- BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}
Expand Down
10 changes: 5 additions & 5 deletions helm/alfresco-content-services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Hence, setting up explicit Container memory and then assigning a percentage of i
| aiTransformer.image.internalPort | int | `8090` | |
| aiTransformer.image.pullPolicy | string | `"IfNotPresent"` | |
| aiTransformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | |
| aiTransformer.image.tag | string | `"1.4.2-A11"` | |
| aiTransformer.image.tag | string | `"1.4.2"` | |
| aiTransformer.livenessProbe.initialDelaySeconds | int | `10` | |
| aiTransformer.livenessProbe.livenessPercent | int | `400` | |
| aiTransformer.livenessProbe.livenessTransformPeriodSeconds | int | `600` | |
Expand Down Expand Up @@ -93,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.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 | 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.35.0"}}},"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.1"},"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 |
| 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.1"},"initContainer":{"image":{"pullPolicy":"IfNotPresent","repository":"busybox","tag":"1.35.0"},"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` | |
| global.registryPullSecrets[0] | string | `"quay-registry-secret"` | |
Expand Down Expand Up @@ -215,12 +215,12 @@ Hence, setting up explicit Container memory and then assigning a percentage of i
| 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.34.1"` | |
| repository.initContainers.db.image.tag | string | `"1.35.0"` | |
| 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.34.1"` | |
| repository.initContainers.fs.image.tag | string | `"1.35.0"` | |
| repository.initContainers.fs.resources.limits.memory | string | `"10Mi"` | |
| repository.initContainers.fs.resources.requests.memory | string | `"5Mi"` | |
| repository.licenseSecret | string | `nil` | |
Expand Down
2 changes: 1 addition & 1 deletion helm/alfresco-content-services/charts/activemq/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ A Helm chart Providing Apache ActiveMQ.
| image.tag | string | `"5.16.4-jre11-centos7"` | |
| initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
| initContainer.image.repository | string | `"busybox"` | |
| initContainer.image.tag | string | `"1.33.1"` | |
| initContainer.image.tag | string | `"1.35.0"` | |
| initContainer.resources.limits.memory | string | `"10Mi"` | |
| initContainer.resources.requests.memory | string | `"5Mi"` | |
| livenessProbe.failureThreshold | int | `1` | |
Expand Down
2 changes: 1 addition & 1 deletion helm/alfresco-content-services/charts/activemq/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
initContainer:
image:
repository: busybox
tag: 1.33.1
tag: 1.35.0
pullPolicy: IfNotPresent
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ A Helm chart for deploying Alfresco Search
| ingress.whitelist_ips | string | `"0.0.0.0/0"` | Comma separated list of IP CIDR to limit search endpoint over the internet |
| initContainer.image.pullPolicy | string | `"IfNotPresent"` | |
| initContainer.image.repository | string | `"busybox"` | |
| initContainer.image.tag | string | `"1.33.1"` | |
| initContainer.image.tag | string | `"1.35.0"` | |
| initContainer.resources.limits.memory | string | `"10Mi"` | |
| initContainer.resources.requests.memory | string | `"5Mi"` | |
| insightEngineImage.internalPort | int | `8983` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ livenessProbe:
initContainer:
image:
repository: busybox
tag: 1.33.1
tag: 1.35.0
pullPolicy: IfNotPresent
resources:
requests:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ Alfresco Sync Service
| ingress.tls | list | `[]` | useful when running Sync service without SSL termination done by a load balancer, e.g. when ran on Minikube for testing purposes |
| initContainers.activemq.image.pullPolicy | string | `"IfNotPresent"` | |
| initContainers.activemq.image.repository | string | `"busybox"` | |
| initContainers.activemq.image.tag | string | `"1.33.1"` | |
| initContainers.activemq.image.tag | string | `"1.35.0"` | |
| initContainers.activemq.resources.limits.memory | string | `"10Mi"` | |
| initContainers.activemq.resources.requests.memory | string | `"5Mi"` | |
| initContainers.postgres.image.pullPolicy | string | `"IfNotPresent"` | |
| initContainers.postgres.image.repository | string | `"busybox"` | |
| initContainers.postgres.image.tag | string | `"1.33.1"` | |
| initContainers.postgres.image.tag | string | `"1.35.0"` | |
| initContainers.postgres.resources.limits.memory | string | `"10Mi"` | |
| initContainers.postgres.resources.requests.memory | string | `"5Mi"` | |
| postgresql-syncservice.enabled | bool | `true` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ initContainers:
activemq:
image:
repository: busybox
tag: 1.33.1
tag: 1.35.0
pullPolicy: IfNotPresent
resources:
requests:
Expand All @@ -126,7 +126,7 @@ initContainers:
postgres:
image:
repository: busybox
tag: 1.33.1
tag: 1.35.0
pullPolicy: IfNotPresent
resources:
requests:
Expand Down
10 changes: 5 additions & 5 deletions helm/alfresco-content-services/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ repository:
db:
image:
repository: busybox
tag: 1.34.1
tag: 1.35.0
pullPolicy: IfNotPresent
resources:
requests:
Expand All @@ -40,7 +40,7 @@ repository:
fs:
image:
repository: busybox
tag: 1.34.1
tag: 1.35.0
pullPolicy: IfNotPresent
resources:
requests:
Expand Down Expand Up @@ -386,7 +386,7 @@ aiTransformer:
replicaCount: 2
image:
repository: quay.io/alfresco/alfresco-ai-docker-engine
tag: 1.4.2-A11
tag: 1.4.2
pullPolicy: IfNotPresent
internalPort: 8090
service:
Expand Down Expand Up @@ -425,7 +425,7 @@ filestore:
initContainer:
image:
repository: busybox
tag: 1.34.1
tag: 1.35.0
pullPolicy: IfNotPresent
resources:
requests:
Expand Down Expand Up @@ -739,7 +739,7 @@ email:
setPerms:
image:
repository: busybox
tag: 1.34.1
tag: 1.35.0
pullPolicy: IfNotPresent

mail:
Expand Down

0 comments on commit 51b4a6f

Please sign in to comment.