Skip to content

Commit

Permalink
Pick up released ATS components (#645)
Browse files Browse the repository at this point in the history
T-Router 1.5.0
T-Core 2.5.5
SFS 0.16.1

Pick up A22 release of ACS components
  • Loading branch information
alandavis authored Jan 27, 2022
1 parent d1d1d81 commit 84ece98
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The table below shows the exact version of ACS deployed with each chart version/
| 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 |
| 5.2.0-M2 | 7.2.0-A20 | 7.1.1-A5 | 7.0.1 | 6.2.2 | 6.1.1 | 7.2.0-M1 |
| 5.2.0-M2 | 7.2.0-A22 | 7.1.1-A5 | 7.0.1 | 6.2.2 | 6.1.1 | 7.2.0-M1 |

### Docker

Expand Down
4 changes: 2 additions & 2 deletions docker-compose/7.1.N-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ services:

transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:1.5.0-A3
image: quay.io/alfresco/alfresco-transform-router:1.5.0
environment:
JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
ACTIVEMQ_URL: "nio://activemq:61616"
Expand All @@ -65,7 +65,7 @@ services:
- activemq

transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.5.5-A3
image: alfresco/alfresco-transform-core-aio:2.5.5
mem_limit: 1536m
environment:
JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/community-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version: "2"

services:
alfresco:
image: alfresco/alfresco-content-repository-community:7.2.0-A20
image: alfresco/alfresco-content-repository-community:7.2.0-A22
mem_limit: 1500m
environment:
JAVA_TOOL_OPTIONS: "
Expand Down Expand Up @@ -47,15 +47,15 @@ services:
"

transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.5.5-A3
image: alfresco/alfresco-transform-core-aio:2.5.5
mem_limit: 1536m
environment:
JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
ports:
- "8090:8090"

share:
image: alfresco/alfresco-share:7.2.0-A20
image: alfresco/alfresco-share:7.2.0-A22
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
Expand Down
8 changes: 4 additions & 4 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version: "2"

services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:7.2.0-A20
image: quay.io/alfresco/alfresco-content-repository:7.2.0-A22
mem_limit: 1700m
environment:
JAVA_TOOL_OPTIONS: "
Expand Down Expand Up @@ -53,7 +53,7 @@ services:

transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:1.5.0-A3
image: quay.io/alfresco/alfresco-transform-router:1.5.0
environment:
JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
ACTIVEMQ_URL: "nio://activemq:61616"
Expand All @@ -65,7 +65,7 @@ services:
- activemq

transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.5.5-A3
image: alfresco/alfresco-transform-core-aio:2.5.5
mem_limit: 1536m
environment:
JAVA_OPTS: " -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
Expand All @@ -89,7 +89,7 @@ services:
- shared-file-store-volume:/tmp/Alfresco/sfs

share:
image: quay.io/alfresco/alfresco-share:7.2.0-A20
image: quay.io/alfresco/alfresco-share:7.2.0-A22
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
Expand Down
12 changes: 6 additions & 6 deletions helm/alfresco-content-services/7.1.N_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ repository:

transformrouter:
image:
tag: 1.5.0-A3
tag: 1.5.0

pdfrenderer:
image:
tag: 2.5.5-A3
tag: 2.5.5

imagemagick:
image:
tag: 2.5.5-A3
tag: 2.5.5

libreoffice:
image:
tag: 2.5.5-A3
tag: 2.5.5

tika:
image:
tag: 2.5.5-A3
tag: 2.5.5

transformmisc:
image:
tag: 2.5.5-A3
tag: 2.5.5

aiTransformer:
image:
Expand Down
16 changes: 8 additions & 8 deletions helm/alfresco-content-services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ Hence, setting up explicit Container memory and then assigning a percentage of i
| global.registryPullSecrets[0] | string | `"quay-registry-secret"` | |
| global.strategy.rollingUpdate.maxSurge | int | `1` | |
| global.strategy.rollingUpdate.maxUnavailable | int | `0` | |
| imagemagick | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-imagemagick","tag":"2.5.5-A3"},"livenessProbe":{"initialDelaySeconds":10,"livenessPercent":150,"livenessTransformPeriodSeconds":600,"maxTransformSeconds":900,"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":"imagemagick","type":"ClusterIP"}}` | Declares the alfresco-imagemagick service used by the content repository to transform image files |
| imagemagick | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-imagemagick","tag":"2.5.5"},"livenessProbe":{"initialDelaySeconds":10,"livenessPercent":150,"livenessTransformPeriodSeconds":600,"maxTransformSeconds":900,"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":"imagemagick","type":"ClusterIP"}}` | Declares the alfresco-imagemagick service used by the content repository to transform image files |
| imap.mail.from.default | string | `nil` | |
| imap.mail.to.default | string | `nil` | |
| imap.server | object | `{"enabled":false,"host":"0.0.0.0","imap":{"enabled":true},"imaps":{"enabled":true,"port":1144},"port":1143}` | Replace this value with the IP address (or corresponding DNS name) of your external IP interface - see https://docs.alfresco.com/6.2/tasks/imap-enable.html |
| libreoffice | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-libreoffice","tag":"2.5.5-A3"},"livenessProbe":{"initialDelaySeconds":10,"livenessPercent":250,"livenessTransformPeriodSeconds":600,"maxTransformSeconds":1800,"maxTransforms":99999,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":20,"periodSeconds":60,"timeoutSeconds":10},"replicaCount":2,"resources":{"limits":{"memory":"1000Mi"},"requests":{"memory":"1000Mi"}},"service":{"externalPort":80,"name":"libreoffice","type":"ClusterIP"}}` | Declares the alfresco-libreoffice service used by the content repository to transform office files |
| libreoffice | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-libreoffice","tag":"2.5.5"},"livenessProbe":{"initialDelaySeconds":10,"livenessPercent":250,"livenessTransformPeriodSeconds":600,"maxTransformSeconds":1800,"maxTransforms":99999,"periodSeconds":20,"timeoutSeconds":10},"readinessProbe":{"initialDelaySeconds":20,"periodSeconds":60,"timeoutSeconds":10},"replicaCount":2,"resources":{"limits":{"memory":"1000Mi"},"requests":{"memory":"1000Mi"}},"service":{"externalPort":80,"name":"libreoffice","type":"ClusterIP"}}` | Declares the alfresco-libreoffice service used by the content repository to transform office files |
| mail.encoding | string | `"UTF-8"` | |
| mail.from.default | string | `nil` | |
| mail.from.enabled | bool | `false` | |
Expand Down Expand Up @@ -169,7 +169,7 @@ Hence, setting up explicit Container memory and then assigning a percentage of i
| ooiService.service.externalPort | int | `80` | |
| ooiService.service.name | string | `"ooi-service"` | |
| ooiService.service.type | string | `"ClusterIP"` | |
| pdfrenderer | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-pdf-renderer","tag":"2.5.5-A3"},"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 |
| pdfrenderer | object | `{"environment":{"JAVA_OPTS":" -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"},"image":{"internalPort":8090,"pullPolicy":"IfNotPresent","repository":"alfresco/alfresco-pdf-renderer","tag":"2.5.5"},"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 class name |
Expand Down Expand Up @@ -207,7 +207,7 @@ 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.2.0-A20"` | |
| repository.image.tag | string | `"7.2.0-A22"` | |
| repository.ingress.annotations | object | `{}` | |
| repository.ingress.maxUploadSize | string | `"5g"` | |
| repository.ingress.path | string | `"/"` | |
Expand All @@ -234,14 +234,14 @@ 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.2.0-A20"},"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.5-A3"},"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.5-A3"},"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 |
| 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-A22"},"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.5"},"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.5"},"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"` | |
| transformrouter.image.internalPort | int | `8095` | |
| transformrouter.image.pullPolicy | string | `"IfNotPresent"` | |
| transformrouter.image.repository | string | `"quay.io/alfresco/alfresco-transform-router"` | |
| transformrouter.image.tag | string | `"1.5.0-A3"` | |
| transformrouter.image.tag | string | `"1.5.0"` | |
| transformrouter.livenessProbe.initialDelaySeconds | int | `140` | |
| transformrouter.livenessProbe.periodSeconds | int | `120` | |
| transformrouter.livenessProbe.timeoutSeconds | int | `60` | |
Expand Down
16 changes: 8 additions & 8 deletions helm/alfresco-content-services/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repository:
type: Recreate
image:
repository: quay.io/alfresco/alfresco-content-repository
tag: 7.2.0-A20
tag: 7.2.0-A22
pullPolicy: IfNotPresent
internalPort: 8080
hazelcastPort: 5701
Expand Down Expand Up @@ -192,7 +192,7 @@ transformrouter:
replicaCount: 2
image:
repository: quay.io/alfresco/alfresco-transform-router
tag: 1.5.0-A3
tag: 1.5.0
pullPolicy: IfNotPresent
internalPort: 8095
service:
Expand Down Expand Up @@ -221,7 +221,7 @@ pdfrenderer:
replicaCount: 2
image:
repository: alfresco/alfresco-pdf-renderer
tag: 2.5.5-A3
tag: 2.5.5
pullPolicy: IfNotPresent
internalPort: 8090
service:
Expand Down Expand Up @@ -254,7 +254,7 @@ imagemagick:
replicaCount: 2
image:
repository: alfresco/alfresco-imagemagick
tag: 2.5.5-A3
tag: 2.5.5
pullPolicy: IfNotPresent
internalPort: 8090
service:
Expand Down Expand Up @@ -287,7 +287,7 @@ libreoffice:
replicaCount: 2
image:
repository: alfresco/alfresco-libreoffice
tag: 2.5.5-A3
tag: 2.5.5
pullPolicy: IfNotPresent
internalPort: 8090
service:
Expand Down Expand Up @@ -320,7 +320,7 @@ tika:
replicaCount: 2
image:
repository: alfresco/alfresco-tika
tag: 2.5.5-A3
tag: 2.5.5
pullPolicy: IfNotPresent
internalPort: 8090
service:
Expand Down Expand Up @@ -354,7 +354,7 @@ transformmisc:
replicaCount: 2
image:
repository: alfresco/alfresco-transform-misc
tag: 2.5.5-A3
tag: 2.5.5
pullPolicy: IfNotPresent
internalPort: 8090
service:
Expand Down Expand Up @@ -461,7 +461,7 @@ share:
replicaCount: 1
image:
repository: quay.io/alfresco/alfresco-share
tag: 7.2.0-A20
tag: 7.2.0-A22
pullPolicy: IfNotPresent
internalPort: 8080
service:
Expand Down

0 comments on commit 84ece98

Please sign in to comment.