JSS v15 variation for Sitecore 10 containers (Sitecore#403)

* Added JSS v15 package file to sitecore-packages.json * Added reference for JSS v15 for v10 Linux assets * Duplication of build tags and build options for JSS v15 * Added JSS v15 tags, and shift up the non version specific to JSS v15 * Refactoring * Changed a space in a file to test github setting * Fixing incorrect module image tag Co-authored-by: jfl <[email protected]>
sitecore-design · Nov 3, 2020 · e74d0cf · e74d0cf
1 parent f2c341d
commit e74d0cf
Show file tree

Hide file tree

Showing 18 changed files with 795 additions and 136 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [//]: # "start: stats"
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg?style=flat-square)](https://opensource.org/licenses/MIT) ![Repositories](https://img.shields.io/badge/Repositories-185-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-1009-blue.svg?style=flat-square) ![Deprecated](https://img.shields.io/badge/Deprecated-0-lightgrey.svg?style=flat-square) ![Dockerfiles](https://img.shields.io/badge/Dockerfiles-107-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-10.0.0%20on%20ltsc2019/1809-blue?style=flat-square)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg?style=flat-square)](https://opensource.org/licenses/MIT) ![Repositories](https://img.shields.io/badge/Repositories-228-blue.svg?style=flat-square) ![Tags](https://img.shields.io/badge/Tags-1187-blue.svg?style=flat-square) ![Deprecated](https://img.shields.io/badge/Deprecated-0-lightgrey.svg?style=flat-square) ![Dockerfiles](https://img.shields.io/badge/Dockerfiles-111-blue.svg?style=flat-square) ![Default version](https://img.shields.io/badge/Default%20version-10.0.0%20on%20ltsc2019/1809-blue?style=flat-square)
 
 [//]: # "end: stats"
 

diff --git a/build/CHANGELOG.md b/build/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## October 2020
 
+- [Added] JSS 15 images
+- [**Breaking**] -JSS tags now upgraded to v10. To use JSS v14, make sure you use the `-jss1400` tag
 - [Added] missing packages to download file
 - [**Breaking**] Renamed `Download-PS-Prerequisites.ps1` to `Download-Module-Prerequisites.ps1`
 - [Changed] Refactored `Download-Module-Prerequisites.ps1` to download more than just Publishing Service
@@ -34,7 +36,6 @@
 - [Added] Sitecore 10.0.0 XM/SPE/SXA/JSS/PS Windows images.
 - [Added] Sitecore 10.0.0 XP/SPE/SXA/JSS/PS Windows images.
 
-
 ## July 2020
 
 - [Bug] Sitecore 9.3.0 XP set ServerName xConnect shards on SQL linux images.

diff --git a/build/IMAGES.md b/build/IMAGES.md
diff --git a/build/linux/10.0.0/modules/Dockerfile b/build/linux/10.0.0/modules/Dockerfile
@@ -7,20 +7,20 @@ FROM ${BASE_IMAGE} as build
 SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ARG ROLES
-
+ARG ASSET_FILE_NAME="*.zip"
 COPY tools/ tools/
-COPY *.zip /wdp/
+COPY ["${ASSET_FILE_NAME}", "/wdp/"]
 
 WORKDIR /wdp
 
- RUN New-Item -ItemType Directory -Path cm; `
-        Get-ChildItem -File | Where-Object {$_.Name -match '^.*(Content Delivery|CD).*$'} | Foreach-Object { if (!(Test-Path ./cd)) { New-Item -ItemType Directory cd} Move-Item $_ -Destination (Resolve-Path ./cd)} -ErrorAction SilentlyContinue; `
-        Move-Item *.zip cm/
+RUN New-Item -ItemType Directory -Path cm; `
+    Get-ChildItem -File | Where-Object {$_.Name -match '^.*(Content Delivery|CD).*$'} | Foreach-Object { if (!(Test-Path ./cd)) { New-Item -ItemType Directory cd} Move-Item $_ -Destination (Resolve-Path ./cd)} -ErrorAction SilentlyContinue; `
+    Move-Item *.zip cm/
 
 WORKDIR /
 
 RUN ./tools/Extract-Resources.ps1 -Roles $env:ROLES -SourceFolder /wdp -DestinationFolder /extract
 
 FROM ${BASE_IMAGE} as production
 
-COPY --from=build /extract /module/
+COPY --from=build /extract /module/
diff --git a/build/linux/10.0.0/modules/jss-assets/1400-build.json b/build/linux/10.0.0/modules/jss-assets/1400-build.json
@@ -0,0 +1,26 @@
+{
+  "tags": [
+    {
+      "tag": "community/modules/custom-jss1400-xp-assets:10.0.0-linux",
+      "build-options": [
+        "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-alpine-3.10",
+        "--build-arg ROLES=cm",
+        "--build-arg ASSET_FILE_NAME='Sitecore JavaScript Services Server for Sitecore 10.0.0 XP 14.0.0 rev. 200714.scwdp.zip'",
+        "--file linux/10.0.0/modules/Dockerfile"
+      ]
+    },
+    {
+        "tag": "community/modules/custom-jss1400-xm-assets:10.0.0-linux",
+        "build-options": [
+          "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-alpine-3.10",
+          "--build-arg ROLES=cm",
+          "--build-arg ASSET_FILE_NAME='Sitecore JavaScript Services Server for Sitecore 10.0.0 XM 14.0.0 rev. 200714.scwdp.zip'",
+          "--file linux/10.0.0/modules/Dockerfile"
+        ]
+      }
+  ],
+  "sources": [
+    "Sitecore JavaScript Services Server for Sitecore 10.0.0 XP 14.0.0 rev. 200714.scwdp.zip",
+    "Sitecore JavaScript Services Server for Sitecore 10.0.0 XM 14.0.0 rev. 200714.scwdp.zip"
+  ]
+}
diff --git a/build/linux/10.0.0/modules/jss-assets/1500-build.json b/build/linux/10.0.0/modules/jss-assets/1500-build.json
@@ -0,0 +1,44 @@
+{
+    "tags": [
+        {
+            "tag": "community/modules/custom-jss-xp-assets:10.0.0-linux",
+            "build-options": [
+                "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-alpine-3.10",
+                "--build-arg ROLES=cm",
+                "--build-arg ASSET_FILE_NAME='Sitecore JavaScript Services Server for Sitecore 10.0.0 XP 15.0.0 rev. 201020.scwdp.zip'",
+                "--file linux/10.0.0/modules/Dockerfile"
+            ]
+        },
+        {
+            "tag": "community/modules/custom-jss1500-xp-assets:10.0.0-linux",
+            "build-options": [
+                "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-alpine-3.10",
+                "--build-arg ROLES=cm",
+                "--build-arg ASSET_FILE_NAME='Sitecore JavaScript Services Server for Sitecore 10.0.0 XP 15.0.0 rev. 201020.scwdp.zip'",
+                "--file linux/10.0.0/modules/Dockerfile"
+            ]
+        },
+        {
+            "tag": "community/modules/custom-jss-xm-assets:10.0.0-linux",
+            "build-options": [
+                "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-alpine-3.10",
+                "--build-arg ROLES=cm",
+                "--build-arg ASSET_FILE_NAME='Sitecore JavaScript Services Server for Sitecore 10.0.0 XM 15.0.0 rev. 201020.scwdp.zip'",
+                "--file linux/10.0.0/modules/Dockerfile"
+            ]
+        },
+        {
+            "tag": "community/modules/custom-jss1500-xm-assets:10.0.0-linux",
+            "build-options": [
+                "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-alpine-3.10",
+                "--build-arg ROLES=cm",
+                "--build-arg ASSET_FILE_NAME='Sitecore JavaScript Services Server for Sitecore 10.0.0 XM 15.0.0 rev. 201020.scwdp.zip'",
+                "--file linux/10.0.0/modules/Dockerfile"
+            ]
+        }
+    ],
+    "sources": [
+        "Sitecore JavaScript Services Server for Sitecore 10.0.0 XP 15.0.0 rev. 201020.scwdp.zip",
+        "Sitecore JavaScript Services Server for Sitecore 10.0.0 XM 15.0.0 rev. 201020.scwdp.zip"
+    ]
+}
diff --git a/build/linux/10.0.0/modules/jss-assets/build.json b/build/linux/10.0.0/modules/jss-assets/build.json
diff --git a/build/linux/10.0.0/sitecore-modules-mssql/xp0-build.json b/build/linux/10.0.0/sitecore-modules-mssql/xp0-build.json
@@ -21,7 +21,23 @@
       "build-options": [
         "--memory 4GB",
         "--build-arg BASE_IMAGE=community/sitecore-xp0-custom-sxa-mssql:10.0.0-linux",
-        "--build-arg MODULE_ASSETS=community/modules/custom-jss-assets:10.0.0-linux"
+        "--build-arg MODULE_ASSETS=community/modules/custom-jss-xp-assets:10.0.0-linux"
+      ]
+    },
+    {
+      "tag": "community/sitecore-xp0-custom-sxa-jss1400-mssql:10.0.0-linux",
+      "build-options": [
+        "--memory 4GB",
+        "--build-arg BASE_IMAGE=community/sitecore-xp0-custom-sxa-mssql:10.0.0-linux",
+        "--build-arg MODULE_ASSETS=community/modules/custom-jss1400-xp-assets:10.0.0-linux"
+      ]
+    },
+    {
+      "tag": "community/sitecore-xp0-custom-sxa-jss1500-mssql:10.0.0-linux",
+      "build-options": [
+        "--memory 4GB",
+        "--build-arg BASE_IMAGE=community/sitecore-xp0-custom-sxa-mssql:10.0.0-linux",
+        "--build-arg MODULE_ASSETS=community/modules/custom-jss1500-xp-assets:10.0.0-linux"
       ]
     },
     {
@@ -47,6 +63,22 @@
         "--build-arg BASE_IMAGE=community/sitecore-xp0-custom-sxa-jss-mssql:10.0.0-linux",
         "--build-arg MODULE_ASSETS=community/modules/custom-ps-assets:10.0.0-linux"
       ]
+    },
+    {
+      "tag": "community/sitecore-xp0-custom-sxa-jss1400-ps-mssql:10.0.0-linux",
+      "build-options": [
+        "--memory 4GB",
+        "--build-arg BASE_IMAGE=community/sitecore-xp0-custom-sxa-jss1400-mssql:10.0.0-linux",
+        "--build-arg MODULE_ASSETS=community/modules/custom-ps-assets:10.0.0-linux"
+      ]
+    },
+    {
+      "tag": "community/sitecore-xp0-custom-sxa-jss1500-ps-mssql:10.0.0-linux",
+      "build-options": [
+        "--memory 4GB",
+        "--build-arg BASE_IMAGE=community/sitecore-xp0-custom-sxa-jss1500-mssql:10.0.0-linux",
+        "--build-arg MODULE_ASSETS=community/modules/custom-ps-assets:10.0.0-linux"
+      ]
     }
   ],
   "sources": []

diff --git a/build/linux/10.0.0/sitecore-modules-mssql/xp1-build.json b/build/linux/10.0.0/sitecore-modules-mssql/xp1-build.json
@@ -21,9 +21,25 @@
       "build-options": [
         "--memory 4GB",
         "--build-arg BASE_IMAGE=community/sitecore-xp1-custom-sxa-mssql:10.0.0-linux",
-        "--build-arg MODULE_ASSETS=community/modules/custom-jss-assets:10.0.0-linux"
+        "--build-arg MODULE_ASSETS=community/modules/custom-jss-xp-assets:10.0.0-linux"
       ]
     },
+    {
+        "tag": "community/sitecore-xp1-custom-sxa-jss1500-mssql:10.0.0-linux",
+        "build-options": [
+          "--memory 4GB",
+          "--build-arg BASE_IMAGE=community/sitecore-xp1-custom-sxa-mssql:10.0.0-linux",
+          "--build-arg MODULE_ASSETS=community/modules/custom-jss1500-xp-assets:10.0.0-linux"
+        ]
+      },
+      {
+        "tag": "community/sitecore-xp1-custom-sxa-jss1400-mssql:10.0.0-linux",
+        "build-options": [
+          "--memory 4GB",
+          "--build-arg BASE_IMAGE=community/sitecore-xp1-custom-sxa-mssql:10.0.0-linux",
+          "--build-arg MODULE_ASSETS=community/modules/custom-jss1400-xp-assets:10.0.0-linux"
+        ]
+      },
     {
       "tag": "community/sitecore-xp1-custom-spe-ps-mssql:10.0.0-linux",
       "build-options": [
@@ -47,7 +63,22 @@
         "--build-arg BASE_IMAGE=community/sitecore-xp1-custom-sxa-jss-mssql:10.0.0-linux",
         "--build-arg MODULE_ASSETS=community/modules/custom-ps-assets:10.0.0-linux"
       ]
-    }
+    },
+    {
+        "tag": "community/sitecore-xp1-custom-sxa-jss1500-ps-mssql:10.0.0-linux",
+        "build-options": [
+          "--memory 4GB",
+          "--build-arg BASE_IMAGE=community/sitecore-xp1-custom-sxa-jss1500-mssql:10.0.0-linux",
+          "--build-arg MODULE_ASSETS=community/modules/custom-ps-assets:10.0.0-linux"
+        ]
+      },{
+        "tag": "community/sitecore-xp1-custom-sxa-jss1400-ps-mssql:10.0.0-linux",
+        "build-options": [
+          "--memory 4GB",
+          "--build-arg BASE_IMAGE=community/sitecore-xp1-custom-sxa-jss1400-mssql:10.0.0-linux",
+          "--build-arg MODULE_ASSETS=community/modules/custom-ps-assets:10.0.0-linux"
+        ]
+      }
   ],
   "sources": []
 }
diff --git a/build/sitecore-packages.json b/build/sitecore-packages.json
@@ -219,6 +219,18 @@
         "url": "https://dev.sitecore.net/~/media/497E3634E3FA41258BDD6FCB69CB3D6F.ashx",
         "hash": "CC0AE16A94523CC0879F7772E53A8D1844081105B2DC21053750284B96507A1D"
     },
+    "Sitecore JavaScript Services Server for Sitecore 10.0.0 XM 14.0.0 rev. 200714.scwdp.zip": {
+        "url": "https://dev.sitecore.net/~/media/DB53E8083B1944B2AAD5980CCE221070.ashx",
+        "hash": "9BEF80A8373AC4DFDDFE5BB655F917FDDF0AE63DE6EBD6D39A509434F74C380B"
+    },
+    "Sitecore JavaScript Services Server for Sitecore 10.0.0 XP 15.0.0 rev. 201020.scwdp.zip": {
+        "url": "https://dev.sitecore.net/~/media/384105C83898473BA93EE59A40E0E25F.ashx",
+        "hash": "C321686AB5724762566A3DDB4B711671BC851CA33F7567A43638AAD08C783B89"
+    },
+    "Sitecore JavaScript Services Server for Sitecore 10.0.0 XM 15.0.0 rev. 201020.scwdp.zip": {
+        "url": "https://dev.sitecore.net/~/media/9BE6C188B19E4FDEA9D8B30843E0CDF4.ashx",
+        "hash": "D16457F173ED31126CEB8EA75D7C1E8EA0F6DF80D986380C061C4302C6070E06"
+    },
     "Sitecore PowerShell Extensions-5.0 for 9.2.scwdp.zip": {
         "url": "https://dev.sitecore.net/~/media/7AB15C0432624E6CA9786DF00DD653AB.ashx",
         "hash": "6596BEB4E67E1AF4FCCAA7EF77E269A7DF8EFD3F23A5AC9BF8F0355E19AB78CB"

diff --git a/build/windows/10.x.x/sitecore-custom-base/xm-build.json b/build/windows/10.x.x/sitecore-custom-base/xm-build.json
@@ -22,6 +22,26 @@
     },
     {
       "tag": "community/sitecore-xm1-custom-sxa-jss-cm:10.0.0-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=community/sitecore-xm1-custom-sxa-cm:10.0.0-${windowsservercore_version}",
+        "--build-arg MODULE_ASSETS=scr.sitecore.com/sxp/modules/jss-xm1-assets:15.0.0-1809",
+        "--memory 4GB",
+        "--build-arg ROLE=cm",
+        "--target base"
+      ]
+    },
+    {
+      "tag": "community/sitecore-xm1-custom-sxa-jss1500-cm:10.0.0-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=community/sitecore-xm1-custom-sxa-cm:10.0.0-${windowsservercore_version}",
+        "--build-arg MODULE_ASSETS=scr.sitecore.com/sxp/modules/jss-xm1-assets:15.0.0-1809",
+        "--memory 4GB",
+        "--build-arg ROLE=cm",
+        "--target base"
+      ]
+    },
+    {
+      "tag": "community/sitecore-xm1-custom-sxa-jss1400-cm:10.0.0-${windowsservercore_version}",
       "build-options": [
         "--build-arg BASE_IMAGE=community/sitecore-xm1-custom-sxa-cm:10.0.0-${windowsservercore_version}",
         "--build-arg MODULE_ASSETS=scr.sitecore.com/sxp/modules/jss-xm1-assets:14.0.0-1809",
@@ -41,6 +61,28 @@
       ],
       "experimental": true
     },
+    {
+      "tag": "community/sitecore-xm1-custom-sxa-jss1500-ps-cm:10.0.0-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=community/sitecore-xm1-custom-sxa-jss1500-cm:10.0.0-${windowsservercore_version}",
+        "--build-arg MODULE_ASSETS=community/modules/custom-ps-assets:10.0.0-1809",
+        "--memory 4GB",
+        "--build-arg ROLE=cm",
+        "--target base"
+      ],
+      "experimental": true
+    },
+    {
+      "tag": "community/sitecore-xm1-custom-sxa-jss1400-ps-cm:10.0.0-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=community/sitecore-xm1-custom-sxa-jss1400-cm:10.0.0-${windowsservercore_version}",
+        "--build-arg MODULE_ASSETS=community/modules/custom-ps-assets:10.0.0-1809",
+        "--memory 4GB",
+        "--build-arg ROLE=cm",
+        "--target base"
+      ],
+      "experimental": true
+    },
     {
       "tag": "community/sitecore-xm1-custom-spe-cd:10.0.0-${windowsservercore_version}",
       "build-options": [
@@ -63,6 +105,26 @@
     },
     {
       "tag": "community/sitecore-xm1-custom-sxa-jss-cd:10.0.0-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=community/sitecore-xm1-custom-sxa-cd:10.0.0-${windowsservercore_version}",
+        "--build-arg MODULE_ASSETS=scr.sitecore.com/sxp/modules/jss-xm1-assets:15.0.0-1809",
+        "--memory 4GB",
+        "--build-arg ROLE=cd",
+        "--target base"
+      ]
+    },
+    {
+      "tag": "community/sitecore-xm1-custom-sxa-jss1500-cd:10.0.0-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=community/sitecore-xm1-custom-sxa-cd:10.0.0-${windowsservercore_version}",
+        "--build-arg MODULE_ASSETS=scr.sitecore.com/sxp/modules/jss-xm1-assets:15.0.0-1809",
+        "--memory 4GB",
+        "--build-arg ROLE=cd",
+        "--target base"
+      ]
+    },
+    {
+      "tag": "community/sitecore-xm1-custom-sxa-jss1400-cd:10.0.0-${windowsservercore_version}",
       "build-options": [
         "--build-arg BASE_IMAGE=community/sitecore-xm1-custom-sxa-cd:10.0.0-${windowsservercore_version}",
         "--build-arg MODULE_ASSETS=scr.sitecore.com/sxp/modules/jss-xm1-assets:14.0.0-1809",