renamed 9.1.1 xm back to xm1, closes issue #28

sitecoreops · Apr 8, 2019 · 6d692c2 · 6d692c2
1 parent 58d88d7
commit 6d692c2
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -6,9 +6,10 @@ Build your own Docker images out of every released Sitecore version since 8.2 re
 
 ## Changelog
 
+- [**Breaking**] Sitecore 9.1.1 XM images renamed **back** to `xm1`, see [#28](https://github.com/sitecoreops/sitecore-images/issues/28).
 - [Changed] Sitecore 9.1.1 images now overrides default `ENTRYPOINT` to get `ServiceMonitor` to monitor and inject Docker defined environment variables into the Application Pool that runs Sitecore. Thanks [@jballe](https://github.com/jballe) :+1:
 - [Changed] Sitecore 9.1.1 XP Solr image now runs the additional xConnect Solr core configuration from `App_Data`. Thanks [@joostmeijles](https://github.com/joostmeijles) :+1:
-- [Added] Sitecore 9.1.1 XM and XP on ltsc2019/1809, please notice that the `xm1` tags is now just `xm`.
+- [Added] Sitecore 9.1.1 XM and XP on ltsc2019/1809, ~~please notice that the `xm1` tags is now just `xm`~~.
 - [**Breaking**] Sitecore 9.1.0 images tagged with `9.1.001564` is renamed to `9.1.0` to align with the [new Sitecore NuGet versioning](https://sitecore.myget.org/feed/sc-packages/package/nuget/Sitecore.Kernel/9.1.0).
 - [Added] Sitecore 7.5.150212 CM/CD and SQL on 1803.
 - [Added] Sitecore 8.2.161221 CM/CD and SQL on 1709/1803.
@@ -59,12 +60,12 @@ Build your own Docker images out of every released Sitecore version since 8.2 re
 | 9.1.1 | sitecore-xp-sqldev | windowsservercore | ltsc2019 | `sitecore-xp-sqldev:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xp-sqldev/Dockerfile) |
 | 9.1.1 | sitecore-xp-cd | windowsservercore | ltsc2019 | `sitecore-xp-cd:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xp-cd/Dockerfile) |
 | 9.1.1 | sitecore-xp-base | windowsservercore | ltsc2019 | `sitecore-xp-base:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xp-base/Dockerfile) |
-| 9.1.1 | sitecore-xm-sqldev | windowsservercore | ltsc2019 | `sitecore-xm-sqldev:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xm-sqldev/Dockerfile) |
-| 9.1.1 | sitecore-xm-cm | windowsservercore | ltsc2019 | `sitecore-xm-cm:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xm-cm/Dockerfile) |
-| 9.1.1 | sitecore-xm-cd | windowsservercore | ltsc2019 | `sitecore-xm-cd:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xm-cd/Dockerfile) |
+| 9.1.1 | sitecore-xm1-sqldev | windowsservercore | ltsc2019 | `sitecore-xm1-sqldev:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xm1-sqldev/Dockerfile) |
+| 9.1.1 | sitecore-xm1-cm | windowsservercore | ltsc2019 | `sitecore-xm1-cm:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xm1-cm/Dockerfile) |
+| 9.1.1 | sitecore-xm1-cd | windowsservercore | ltsc2019 | `sitecore-xm1-cd:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-xm1-cd/Dockerfile) |
 | 9.1.1 | sitecore-base | windowsservercore | ltsc2019 | `sitecore-base:9.1.1-windowsservercore-ltsc2019` [Dockerfile](images/9.1.1%20rev.%20002459/windowsservercore-ltsc2019/sitecore-base/Dockerfile) |
 | 9.1.1 | sitecore-xp-solr | nanoserver | 1809 | `sitecore-xp-solr:9.1.1-nanoserver-1809` [Dockerfile](images/9.1.1%20rev.%20002459/nanoserver-1809/sitecore-xp-solr/Dockerfile) |
-| 9.1.1 | sitecore-xm-solr | nanoserver | 1809 | `sitecore-xm-solr:9.1.1-nanoserver-1809` [Dockerfile](images/9.1.1%20rev.%20002459/nanoserver-1809/sitecore-xm-solr/Dockerfile) |
+| 9.1.1 | sitecore-xm1-solr | nanoserver | 1809 | `sitecore-xm1-solr:9.1.1-nanoserver-1809` [Dockerfile](images/9.1.1%20rev.%20002459/nanoserver-1809/sitecore-xm1-solr/Dockerfile) |
 | 9.1.0 | sitecore-xp-xconnect-indexworker | windowsservercore | ltsc2019 | `sitecore-xp-xconnect-indexworker:9.1.0-windowsservercore-ltsc2019` [Dockerfile](images/9.1.0%20rev.%20001564/windowsservercore-ltsc2019/sitecore-xp-xconnect-indexworker/Dockerfile) |
 | 9.1.0 | sitecore-xp-xconnect-automationengine | windowsservercore | ltsc2019 | `sitecore-xp-xconnect-automationengine:9.1.0-windowsservercore-ltsc2019` [Dockerfile](images/9.1.0%20rev.%20001564/windowsservercore-ltsc2019/sitecore-xp-xconnect-automationengine/Dockerfile) |
 | 9.1.0 | sitecore-xp-xconnect | windowsservercore | ltsc2019 | `sitecore-xp-xconnect:9.1.0-windowsservercore-ltsc2019` [Dockerfile](images/9.1.0%20rev.%20001564/windowsservercore-ltsc2019/sitecore-xp-xconnect/Dockerfile) |

diff --git a/...nanoserver-1809/sitecore-xm-solr/Boot.cmd → ...anoserver-1809/sitecore-xm1-solr/Boot.cmd b/...nanoserver-1809/sitecore-xm-solr/Boot.cmd → ...anoserver-1809/sitecore-xm1-solr/Boot.cmd
diff --git a/...noserver-1809/sitecore-xm-solr/Dockerfile → ...oserver-1809/sitecore-xm1-solr/Dockerfile b/...noserver-1809/sitecore-xm-solr/Dockerfile → ...oserver-1809/sitecore-xm1-solr/Dockerfile
diff --git a/...noserver-1809/sitecore-xm-solr/build.json → ...oserver-1809/sitecore-xm1-solr/build.json b/...noserver-1809/sitecore-xm-solr/build.json → ...oserver-1809/sitecore-xm1-solr/build.json
@@ -1,5 +1,5 @@
 {
-    "tag": "sitecore-xm-solr:9.1.1-nanoserver-1809",
+    "tag": "sitecore-xm1-solr:9.1.1-nanoserver-1809",
     "sources": [
         "Sitecore 9.1.1 rev. 002459 (WDP XM1 packages).zip"
     ]

diff --git a/...ercore-ltsc2019/sitecore-xm-cd/Dockerfile → ...rcore-ltsc2019/sitecore-xm1-cd/Dockerfile b/...ercore-ltsc2019/sitecore-xm-cd/Dockerfile → ...rcore-ltsc2019/sitecore-xm1-cd/Dockerfile
diff --git a/...m-cd/Sitecore/Scripts/Watch-Directory.ps1 → ...1-cd/Sitecore/Scripts/Watch-Directory.ps1 b/...m-cd/Sitecore/Scripts/Watch-Directory.ps1 → ...1-cd/Sitecore/Scripts/Watch-Directory.ps1
diff --git a/...ercore-ltsc2019/sitecore-xm-cd/build.json → ...rcore-ltsc2019/sitecore-xm1-cd/build.json b/...ercore-ltsc2019/sitecore-xm-cd/build.json → ...rcore-ltsc2019/sitecore-xm1-cd/build.json
@@ -1,5 +1,5 @@
 {
-    "tag": "sitecore-xm-cd:9.1.1-windowsservercore-ltsc2019",
+    "tag": "sitecore-xm1-cd:9.1.1-windowsservercore-ltsc2019",
     "sources": [
         "license.xml",
         "Sitecore 9.1.1 rev. 002459 (WDP XM1 packages).zip"

diff --git a/...ercore-ltsc2019/sitecore-xm-cm/Dockerfile → ...rcore-ltsc2019/sitecore-xm1-cm/Dockerfile b/...ercore-ltsc2019/sitecore-xm-cm/Dockerfile → ...rcore-ltsc2019/sitecore-xm1-cm/Dockerfile
diff --git a/...m-cm/Sitecore/Scripts/Watch-Directory.ps1 → ...1-cm/Sitecore/Scripts/Watch-Directory.ps1 b/...m-cm/Sitecore/Scripts/Watch-Directory.ps1 → ...1-cm/Sitecore/Scripts/Watch-Directory.ps1
diff --git a/...ercore-ltsc2019/sitecore-xm-cm/build.json → ...rcore-ltsc2019/sitecore-xm1-cm/build.json b/...ercore-ltsc2019/sitecore-xm-cm/build.json → ...rcore-ltsc2019/sitecore-xm1-cm/build.json
@@ -1,5 +1,5 @@
 {
-    "tag": "sitecore-xm-cm:9.1.1-windowsservercore-ltsc2019",
+    "tag": "sitecore-xm1-cm:9.1.1-windowsservercore-ltsc2019",
     "sources": [
         "license.xml",
         "Sitecore 9.1.1 rev. 002459 (WDP XM1 packages).zip"

diff --git a/...core-ltsc2019/sitecore-xm-sqldev/Boot.ps1 → ...ore-ltsc2019/sitecore-xm1-sqldev/Boot.ps1 b/...core-ltsc2019/sitecore-xm-sqldev/Boot.ps1 → ...ore-ltsc2019/sitecore-xm1-sqldev/Boot.ps1
diff --git a/...re-ltsc2019/sitecore-xm-sqldev/Dockerfile → ...e-ltsc2019/sitecore-xm1-sqldev/Dockerfile b/...re-ltsc2019/sitecore-xm-sqldev/Dockerfile → ...e-ltsc2019/sitecore-xm1-sqldev/Dockerfile
diff --git a/.../sitecore-xm-sqldev/Extract-Databases.ps1 → ...sitecore-xm1-sqldev/Extract-Databases.ps1 b/.../sitecore-xm-sqldev/Extract-Databases.ps1 → ...sitecore-xm1-sqldev/Extract-Databases.ps1
diff --git a/.../sitecore-xm-sqldev/Install-Databases.ps1 → ...sitecore-xm1-sqldev/Install-Databases.ps1 b/.../sitecore-xm-sqldev/Install-Databases.ps1 → ...sitecore-xm1-sqldev/Install-Databases.ps1
diff --git a/...ore-ltsc2019/sitecore-xm-sqldev/Start.ps1 → ...re-ltsc2019/sitecore-xm1-sqldev/Start.ps1 b/...ore-ltsc2019/sitecore-xm-sqldev/Start.ps1 → ...re-ltsc2019/sitecore-xm1-sqldev/Start.ps1
diff --git a/...re-ltsc2019/sitecore-xm-sqldev/build.json → ...e-ltsc2019/sitecore-xm1-sqldev/build.json b/...re-ltsc2019/sitecore-xm-sqldev/build.json → ...e-ltsc2019/sitecore-xm1-sqldev/build.json
@@ -1,5 +1,5 @@
 {
-    "tag": "sitecore-xm-sqldev:9.1.1-windowsservercore-ltsc2019",
+    "tag": "sitecore-xm1-sqldev:9.1.1-windowsservercore-ltsc2019",
     "sources": [
         "Sitecore 9.1.1 rev. 002459 (WDP XM1 packages).zip"
     ]

diff --git a/tests/9.1.1 rev. 002459/ltsc2019/docker-compose.xm.yml b/tests/9.1.1 rev. 002459/ltsc2019/docker-compose.xm.yml
@@ -3,7 +3,7 @@ version: '2.4'
 services:
 
   sql:
-    image: sitecore-xm-sqldev:9.1.1-windowsservercore-ltsc2019
+    image: sitecore-xm1-sqldev:9.1.1-windowsservercore-ltsc2019
     volumes:
       - .\data\sql:C:\Data
     mem_limit: 2GB
@@ -12,7 +12,7 @@ services:
       - "44010:1433"
 
   solr:
-    image: sitecore-xm-solr:9.1.1-nanoserver-1809
+    image: sitecore-xm1-solr:9.1.1-nanoserver-1809
     volumes:
       - .\data\solr:C:\Data
     mem_limit: 1GB
@@ -21,7 +21,7 @@ services:
       - "44011:8983"
 
   cd:
-    image: sitecore-xm-cd:9.1.1-windowsservercore-ltsc2019
+    image: sitecore-xm1-cd:9.1.1-windowsservercore-ltsc2019
     volumes:
       - .\data\cd:C:\inetpub\sc\App_Data\logs
     isolation: process
@@ -32,7 +32,7 @@ services:
       - solr
 
   cm:
-    image: sitecore-xm-cm:9.1.1-windowsservercore-ltsc2019
+    image: sitecore-xm1-cm:9.1.1-windowsservercore-ltsc2019
     volumes:
       - .\data\cm:C:\inetpub\sc\App_Data\logs
     isolation: process