From 88f33d00836d237603230aca85fd949b3a1c01e4 Mon Sep 17 00:00:00 2001 From: Mihaela Popa Date: Tue, 27 Mar 2018 14:36:33 +0300 Subject: [PATCH 1/3] REPO-3300: Deployment: 6.0 Base Images Stack Alignment Update the images to use Postgres 10.1 and postgresql driver 42.2.1 --- docker-compose/docker-compose.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 2e02b5419e..ac973a4921 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -27,7 +27,7 @@ services: - 8080:8080 postgres: - image: postgres:9.4.12 + image: postgres:10.1 environment: - POSTGRES_PASSWORD=alfresco - POSTGRES_USER=alfresco diff --git a/pom.xml b/pom.xml index 622801ab18..1a16a59ae0 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ alfresco-community ${alfresco.package.name}-distribution - 9.4.1212 + 42.2.1 From 35ca652e1c5886fb386403d56daa0826ae14797e Mon Sep 17 00:00:00 2001 From: Mihaela Popa Date: Tue, 27 Mar 2018 15:22:13 +0300 Subject: [PATCH 2/3] REPO-3300: Deployment: 6.0 Base Images Stack Alignment Update the values for helm to use Postgres 10.1. Update docker-compose used for tests in bamboo to use postgres 10.1 --- docker-alfresco/test/docker-compose.yml | 2 +- helm/alfresco-content-services-community/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-alfresco/test/docker-compose.yml b/docker-alfresco/test/docker-compose.yml index 30f15e8e60..54aaec709c 100644 --- a/docker-alfresco/test/docker-compose.yml +++ b/docker-alfresco/test/docker-compose.yml @@ -29,7 +29,7 @@ services: - "30000-30099:30000-30099" postgres: - image: docker.io/library/postgres:9.4.12 + image: docker.io/library/postgres:10.1 environment: - POSTGRES_PASSWORD=alfresco - POSTGRES_USER=alfresco diff --git a/helm/alfresco-content-services-community/values.yaml b/helm/alfresco-content-services-community/values.yaml index ffb2d9cf38..24ad5e9d08 100644 --- a/helm/alfresco-content-services-community/values.yaml +++ b/helm/alfresco-content-services-community/values.yaml @@ -86,7 +86,7 @@ postgresql: ## If true, install the postgresql chart alongside Alfresco Content Services enabled: true nameOverride: postgresql-acs - imageTag: "9.4.12" + imageTag: "10.1" postgresUser: alfresco postgresPassword: alfresco postgresDatabase: alfresco From 0e92e3671f15bf910416e54577900b490f2197e5 Mon Sep 17 00:00:00 2001 From: Mihaela Popa Date: Tue, 27 Mar 2018 18:25:00 +0300 Subject: [PATCH 3/3] REPO-3300: Deployment: 6.0 Base Images Stack Alignment Update the Postgres chart version withing requirements.yaml to 0.9.3 --- helm/alfresco-content-services-community/requirements.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/alfresco-content-services-community/requirements.yaml b/helm/alfresco-content-services-community/requirements.yaml index 5dfbc3cf41..b958f7fa49 100644 --- a/helm/alfresco-content-services-community/requirements.yaml +++ b/helm/alfresco-content-services-community/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: postgresql - version: 0.8.5 + version: 0.9.3 repository: https://kubernetes-charts.storage.googleapis.com/ condition: postgresql.enabled \ No newline at end of file