Skip to content

Commit 2c02469

Browse files
sc-mingshengkhoosc-mingshengkhoo
authored
Merge pull request #158 from Sitecore/publishing/10.4.0.00689.430
 Add Sitecore Publishing Service Module Container Deployment 10.4.0.00689.430 ltsc2019
2 parents 82bf7dd + bcab3c0 commit 2c02469

File tree

11 files changed

+309
-0
lines changed

11 files changed

+309
-0
lines changed

‎compose/publishing/10.4/ltsc2019/.env-example‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#Add the following environment variables to the Sitecore Platform .env file
2+
3+
#The version tag for the CM and CD patched images
4+
VERSION=
5+
6+
#Sitecore Platform topology to deploy
7+
TOPOLOGY=

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
services:
2+
cm:
3+
image: sitecore-sps-integration-${TOPOLOGY}-cm:${VERSION}
4+
environment:
5+
Sitecore_Publishing_Service_Url: "http://sps/"
6+
cd:
7+
image: sitecore-sps-integration-${TOPOLOGY}-cd:${VERSION}
8+
mssql-init:
9+
image: sitecore-sps-integration-${TOPOLOGY}-mssql-init:${VERSION}
10+
sps-mssql-init:
11+
isolation: ${ISOLATION}
12+
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:7.0-ltsc2019
13+
environment:
14+
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
20+
depends_on:
21+
mssql-init:
22+
condition: service_healthy
23+
sps:
24+
isolation: ${ISOLATION}
25+
image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:7.1-ltsc2019
26+
environment:
27+
ASPNETCORE_URLS: "http://*:80"
28+
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+
ports:
34+
- "80"
35+
depends_on:
36+
- sps-mssql-init
37+
healthcheck:
38+
test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
39+
timeout: 300s

‎k8s/publishing/10.4/ltsc2019/overrides/xm1/init/kustomization.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
bases:
5+
- ../../../xm1/init
6+
7+
images:
8+
- name: scr.sitecore.com/sxp/sitecore-xm1-mssql-init
9+
newName: "{registry}/sitecore-sps-integration-xm1-mssql-init"
10+
newTag: tag

‎k8s/publishing/10.4/ltsc2019/overrides/xm1/kustomization.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
bases:
5+
- ../../xm1
6+
- ../../sps
7+
8+
images:
9+
- name: scr.sitecore.com/sxp/sitecore-xm1-cm
10+
newName: "{registry}/sitecore-sps-integration-xm1-cm"
11+
newTag: tag
12+
- name: scr.sitecore.com/sxp/sitecore-xm1-cd
13+
newName: "{registry}/sitecore-sps-integration-xm1-cd"
14+
newTag: tag
15+
16+
patchesStrategicMerge:
17+
- patch-cm.sps.yaml

‎k8s/publishing/10.4/ltsc2019/overrides/xm1/patch-cm.sps.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: cm
5+
spec:
6+
selector:
7+
matchLabels:
8+
app: cm
9+
template:
10+
metadata:
11+
labels:
12+
app: cm
13+
spec:
14+
nodeSelector:
15+
kubernetes.io/os: windows
16+
containers:
17+
- name: sitecore-xm1-cm
18+
env:
19+
- name: Sitecore_Publishing_Service_Url
20+
value: http://sps/

‎k8s/publishing/10.4/ltsc2019/overrides/xp1/init/kustomization.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
bases:
5+
- ../../../xp1/init
6+
7+
images:
8+
- name: scr.sitecore.com/sxp/sitecore-xp1-mssql-init
9+
newName: "{registry}/sitecore-sps-integration-xp1-mssql-init"
10+
newTag: tag

‎k8s/publishing/10.4/ltsc2019/overrides/xp1/kustomization.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
bases:
5+
- ../../xp1
6+
- ../../sps
7+
8+
images:
9+
- name: scr.sitecore.com/sxp/sitecore-xp1-cm
10+
newName: "{registry}/sitecore-sps-integration-xp1-cm"
11+
newTag: tag
12+
- name: scr.sitecore.com/sxp/sitecore-xp1-cd
13+
newName: "{registry}/sitecore-sps-integration-xp1-cd"
14+
newTag: tag
15+
16+
patchesStrategicMerge:
17+
- patch-cm.sps.yaml

‎k8s/publishing/10.4/ltsc2019/overrides/xp1/patch-cm.sps.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: cm
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: sitecore-xp1-cm
10+
env:
11+
- name: Sitecore_Publishing_Service_Url
12+
value: http://sps/

‎k8s/publishing/10.4/ltsc2019/sps/kustomization.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
4+
images:
5+
- name: sitecore-sps
6+
newName: scr.sitecore.com/sxp/modules/sitecore-sps
7+
newTag: 7.0-ltsc2019
8+
9+
resources:
10+
- sps.yaml
11+
12+
patchesStrategicMerge:
13+
- patch-sps.yaml

‎k8s/publishing/10.4/ltsc2019/sps/patch-sps.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: sps
5+
spec:
6+
template:
7+
spec:
8+
initContainers:
9+
- name: sitecore-sps-init
10+
image: sitecore-sps
11+
args: ["schema", "upgrade", "--force"]
12+
env:
13+
- name: Sitecore_License
14+
valueFrom:
15+
secretKeyRef:
16+
name: sitecore-license
17+
key: sitecore-license.txt
18+
- name: Database_Server
19+
valueFrom:
20+
secretKeyRef:
21+
name: sitecore-database
22+
key: sitecore-databaseservername.txt
23+
- name: Database_Prefix
24+
valueFrom:
25+
secretKeyRef:
26+
name: sitecore-database
27+
key: sitecore-databaseprefix.txt
28+
- name: Database_Admin_Username
29+
valueFrom:
30+
secretKeyRef:
31+
name: sitecore-database
32+
key: sitecore-databaseusername.txt
33+
- name: Database_Admin_Password
34+
valueFrom:
35+
secretKeyRef:
36+
name: sitecore-database
37+
key: sitecore-databasepassword.txt
38+
- name: SITECORE_Publishing__ConnectionStrings__Core
39+
value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Core;User ID=$(Database_Admin_Username);Password=$(Database_Admin_Password);MultipleActiveResultSets=True
40+
- name: SITECORE_Publishing__ConnectionStrings__Master
41+
value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Master;User ID=$(Database_Admin_Username);Password=$(Database_Admin_Password);MultipleActiveResultSets=True
42+
- name: SITECORE_Publishing__ConnectionStrings__Service
43+
value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Master;User ID=$(Database_Admin_Username);Password=$(Database_Admin_Password);MultipleActiveResultSets=True
44+
- name: SITECORE_Publishing__ConnectionStrings__Web
45+
value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Web;User ID=$(Database_Admin_Username);Password=$(Database_Admin_Password);MultipleActiveResultSets=True

0 commit comments

Comments
 (0)