Skip to content

Commit 723b408

Browse files
sc-garvsudhirnairsc-garvsudhirnair
authored
Merge pull request #163 from Sitecore/publishing/10.4.0.00703.467
Update Publishing Service Module 10.4.0.00703.467
2 parents e4b58ab + 29c9d68 commit 723b408

File tree

4 files changed

+44
-24
lines changed

4 files changed

+44
-24
lines changed

‎compose/publishing/10.4/ltsc2019/docker-compose.sps.override.yml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,39 @@ services:
99
image: sitecore-sps-integration-${TOPOLOGY}-mssql-init:${VERSION}
1010
sps-mssql-init:
1111
isolation: ${ISOLATION}
12-
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:7.0-ltsc2019
12+
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:8.0-ltsc2019
1313
environment:
1414
SITECORE_License: ${SITECORE_LICENSE}
15-
SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
16-
SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
17-
SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
18-
SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
19-
command: schema upgrade --force
15+
SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
16+
SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
17+
SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
18+
SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
19+
command: -AppParameters "schema upgrade --force"
2020
depends_on:
2121
mssql-init:
2222
condition: service_healthy
23+
volumes:
24+
- type: bind
25+
source: .\sps\certs
26+
target: c:\certs
2327
sps:
2428
isolation: ${ISOLATION}
25-
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:7.1-ltsc2019
29+
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:8.0-ltsc2019
2630
environment:
2731
ASPNETCORE_URLS: "http://*:80"
2832
SITECORE_License: ${SITECORE_LICENSE}
29-
SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
30-
SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
31-
SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
32-
SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
33+
SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
34+
SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
35+
SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
36+
SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
3337
ports:
3438
- "80"
3539
depends_on:
3640
- sps-mssql-init
3741
healthcheck:
3842
test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
39-
timeout: 300s
43+
timeout: 300s
44+
volumes:
45+
- type: bind
46+
source: .\sps\certs
47+
target: c:\certs

‎compose/publishing/10.4/ltsc2019/sps/certs/readme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Add a CA certificate to the trusted root store:
2+
RootCA.crt

‎compose/publishing/10.4/ltsc2022/docker-compose.sps.override.yml‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,39 @@ services:
99
image: sitecore-sps-integration-${TOPOLOGY}-mssql-init:${VERSION}
1010
sps-mssql-init:
1111
isolation: ${ISOLATION}
12-
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:7.0-ltsc2022
12+
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:8.0-ltsc2022
1313
environment:
1414
SITECORE_License: ${SITECORE_LICENSE}
15-
SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
16-
SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
17-
SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
18-
SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
19-
command: schema upgrade --force
15+
SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
16+
SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
17+
SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
18+
SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
19+
command: -AppParameters "schema upgrade --force"
2020
depends_on:
2121
mssql-init:
2222
condition: service_healthy
23+
volumes:
24+
- type: bind
25+
source: .\sps\certs
26+
target: c:\certs
2327
sps:
2428
isolation: ${ISOLATION}
25-
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:7.1-ltsc2022
29+
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:8.0-ltsc2022
2630
environment:
2731
ASPNETCORE_URLS: "http://*:80"
2832
SITECORE_License: ${SITECORE_LICENSE}
29-
SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
30-
SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
31-
SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
32-
SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
33+
SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
34+
SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
35+
SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
36+
SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True;Encrypt=True;TrustServerCertificate=False;
3337
ports:
3438
- "80"
3539
depends_on:
3640
- sps-mssql-init
3741
healthcheck:
3842
test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
39-
timeout: 300s
43+
timeout: 300s
44+
volumes:
45+
- type: bind
46+
source: .\sps\certs
47+
target: c:\certs

‎compose/publishing/10.4/ltsc2022/sps/certs/readme‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Add a CA certificate to the trusted root store:
2+
RootCA.crt

0 commit comments

Comments
 (0)