Skip to content
This repository was archived by the owner on Jun 14, 2019. It is now read-only.

Commit a243832

Browse files
committed
converted 8.2.180406
1 parent 38e801c commit a243832

File tree

55 files changed

+204
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+204
-819
lines changed

README.md

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -172,31 +172,33 @@ Build your own Docker images out of every released Sitecore version since 8.2 re
172172
| ~~9.0.171002~~ | ~~sitecore-xm1-cd~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore-xm1-cd:9.0.171002-windowsservercore-1709` [Dockerfile](images/9.0.0%20rev.%20171002/windowsservercore/sitecore-xm1-cd/Dockerfile)~~ |
173173
| ~~9.0.171002~~ | ~~sitecore-sqldev~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore-sqldev:9.0.171002-windowsservercore-1709` [Dockerfile](images/9.0.0%20rev.%20171002/windowsservercore/sitecore-sqldev/Dockerfile)~~ |
174174
| ~~9.0.171002~~ | ~~sitecore-base~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore-base:9.0.171002-windowsservercore-1709` [Dockerfile](images/9.0.0%20rev.%20171002/windowsservercore/sitecore-base/Dockerfile)~~ |
175-
| 8.2.180406 | sitecore-sqldev | windowsservercore | ltsc2019 | `sitecore-sqldev:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-ltsc2019/sitecore-sqldev/Dockerfile) |
176-
| 8.2.180406 | sitecore-reporting | windowsservercore | ltsc2019 | `sitecore-reporting:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-ltsc2019/sitecore-reporting/Dockerfile) |
177-
| 8.2.180406 | sitecore-processing | windowsservercore | ltsc2019 | `sitecore-processing:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-ltsc2019/sitecore-processing/Dockerfile) |
178-
| 8.2.180406 | sitecore-cm | windowsservercore | ltsc2019 | `sitecore-cm:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-ltsc2019/sitecore-cm/Dockerfile) |
179-
| 8.2.180406 | sitecore-cd | windowsservercore | ltsc2019 | `sitecore-cd:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-ltsc2019/sitecore-cd/Dockerfile) |
180-
| 8.2.180406 | sitecore | windowsservercore | ltsc2019 | `sitecore:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-ltsc2019/sitecore/Dockerfile) |
181-
| 8.2.180406 | sitecore-solr | nanoserver | 1809 | `sitecore-solr:8.2.180406-nanoserver-1809` [Dockerfile](images/8.2%20rev.%20180406/nanoserver-1809/sitecore-solr/Dockerfile) |
182-
| 8.2.180406 | sitecore-sqldev | windowsservercore | 1803 | `sitecore-sqldev:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-1803/sitecore-sqldev/Dockerfile) |
175+
| 8.2.180406 | sitecore-sqldev | windowsservercore | ltsc2019 | `sitecore-sqldev:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-sqldev/Dockerfile) |
176+
| 8.2.180406 | sitecore-reporting | windowsservercore | ltsc2019 | `sitecore-reporting:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-reporting/Dockerfile) |
177+
| 8.2.180406 | sitecore-processing | windowsservercore | ltsc2019 | `sitecore-processing:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-processing/Dockerfile) |
178+
| 8.2.180406 | sitecore-cm | windowsservercore | ltsc2019 | `sitecore-cm:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-cm/Dockerfile) |
179+
| 8.2.180406 | sitecore-cd | windowsservercore | ltsc2019 | `sitecore-cd:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-cd/Dockerfile) |
180+
| 8.2.180406 | sitecore | windowsservercore | ltsc2019 | `sitecore:8.2.180406-windowsservercore-ltsc2019` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore/Dockerfile) |
181+
| 8.2.180406 | sitecore-solr | nanoserver | 1809 | `sitecore-solr:8.2.180406-nanoserver-1809` [Dockerfile](images/8.2%20rev.%20180406/nanoserver/sitecore-solr/Dockerfile) |
182+
| 8.2.180406 | sitecore-sqldev | windowsservercore | 1803 | `sitecore-sqldev:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-sqldev/Dockerfile) |
183183
| 8.2.180406 | sitecore-solr | nanoserver | 1803 | `sitecore-solr:8.2.180406-nanoserver-1803` [Dockerfile](images/8.2%20rev.%20180406/nanoserver-1803/sitecore-solr/Dockerfile) |
184-
| 8.2.180406 | sitecore-reporting | windowsservercore | 1803 | `sitecore-reporting:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-1803/sitecore-reporting/Dockerfile) |
185-
| 8.2.180406 | sitecore-processing | windowsservercore | 1803 | `sitecore-processing:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-1803/sitecore-processing/Dockerfile) |
186-
| 8.2.180406 | sitecore-cm | windowsservercore | 1803 | `sitecore-cm:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-1803/sitecore-cm/Dockerfile) |
187-
| 8.2.180406 | sitecore-cd | windowsservercore | 1803 | `sitecore-cd:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-1803/sitecore-cd/Dockerfile) |
188-
| 8.2.180406 | sitecore | windowsservercore | 1803 | `sitecore:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-1803/sitecore/Dockerfile) |
189-
| 8.2.180406 | sitecore | windowsservercore | 1709 | `sitecore:8.2.180406-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore-1709/Dockerfile) |
190-
| 8.2.171121 | sitecore | windowsservercore | 1803 | `sitecore:8.2.171121-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20171121/windowsservercore-1803/sitecore/Dockerfile) |
191-
| 8.2.171121 | sitecore | windowsservercore | 1709 | `sitecore:8.2.171121-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20171121/windowsservercore-1709/sitecore/Dockerfile) |
192-
| 8.2.170728 | sitecore | windowsservercore | 1803 | `sitecore:8.2.170728-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170728/windowsservercore-1803/sitecore/Dockerfile) |
193-
| 8.2.170728 | sitecore | windowsservercore | 1709 | `sitecore:8.2.170728-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20170728/windowsservercore-1709/sitecore/Dockerfile) |
194-
| 8.2.170614 | sitecore-sqldev | windowsservercore | 1803 | `sitecore-sqldev:8.2.170614-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170614/windowsservercore-1803/sitecore-sqldev/Dockerfile) |
195-
| 8.2.170614 | sitecore | windowsservercore | 1803 | `sitecore:8.2.170614-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170614/windowsservercore-1803/sitecore/Dockerfile) |
196-
| 8.2.170614 | sitecore | windowsservercore | 1709 | `sitecore:8.2.170614-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20170614/windowsservercore-1709/sitecore/Dockerfile) |
197-
| 8.2.170407 | sitecore-sqldev | windowsservercore | 1803 | `sitecore-sqldev:8.2.170407-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170407/windowsservercore-1803/sitecore-sqldev/Dockerfile) |
198-
| 8.2.170407 | sitecore | windowsservercore | 1803 | `sitecore:8.2.170407-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170407/windowsservercore-1803/sitecore/Dockerfile) |
199-
| 8.2.170407 | sitecore | windowsservercore | 1709 | `sitecore:8.2.170407-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20170407/windowsservercore-1709/sitecore/Dockerfile) |
184+
| 8.2.180406 | sitecore-reporting | windowsservercore | 1803 | `sitecore-reporting:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-reporting/Dockerfile) |
185+
| 8.2.180406 | sitecore-processing | windowsservercore | 1803 | `sitecore-processing:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-processing/Dockerfile) |
186+
| 8.2.180406 | sitecore-cm | windowsservercore | 1803 | `sitecore-cm:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-cm/Dockerfile) |
187+
| 8.2.180406 | sitecore-cd | windowsservercore | 1803 | `sitecore-cd:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore-cd/Dockerfile) |
188+
| 8.2.180406 | sitecore | windowsservercore | 1803 | `sitecore:8.2.180406-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore/Dockerfile) |
189+
| ~~8.2.180406~~ | ~~sitecore~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore:8.2.180406-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20180406/windowsservercore/sitecore/Dockerfile)~~ |
190+
| 8.2.171121 | sitecore | windowsservercore | 1803 | `sitecore:8.2.171121-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20171121/windowsservercore/sitecore/Dockerfile) |
191+
| ~~8.2.171121~~ | ~~sitecore~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore:8.2.171121-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20171121/windowsservercore/sitecore/Dockerfile)~~ |
192+
| 8.2.170728 | sitecore | windowsservercore | 1803 | `sitecore:8.2.170728-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170728/windowsservercore/sitecore/Dockerfile) |
193+
| ~~8.2.170728~~ | ~~sitecore~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore:8.2.170728-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20170728/windowsservercore/sitecore/Dockerfile)~~ |
194+
| 8.2.170614 | sitecore-sqldev | windowsservercore | 1803 | `sitecore-sqldev:8.2.170614-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170614/windowsservercore/sitecore-sqldev/Dockerfile) |
195+
| 8.2.170614 | sitecore | windowsservercore | 1803 | `sitecore:8.2.170614-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170614/windowsservercore/sitecore/Dockerfile) |
196+
| ~~8.2.170614~~ | ~~sitecore-sqldev~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore-sqldev:8.2.170614-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20170614/windowsservercore/sitecore-sqldev/Dockerfile)~~ |
197+
| ~~8.2.170614~~ | ~~sitecore~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore:8.2.170614-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20170614/windowsservercore/sitecore/Dockerfile)~~ |
198+
| 8.2.170407 | sitecore-sqldev | windowsservercore | 1803 | `sitecore-sqldev:8.2.170407-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170407/windowsservercore/sitecore-sqldev/Dockerfile) |
199+
| 8.2.170407 | sitecore | windowsservercore | 1803 | `sitecore:8.2.170407-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20170407/windowsservercore/sitecore/Dockerfile) |
200+
| ~~8.2.170407~~ | ~~sitecore-sqldev~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore-sqldev:8.2.170407-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20170407/windowsservercore/sitecore-sqldev/Dockerfile)~~ |
201+
| ~~8.2.170407~~ | ~~sitecore~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore:8.2.170407-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20170407/windowsservercore/sitecore/Dockerfile)~~ |
200202
| 8.2.161221 | sitecore-sqldev | windowsservercore | 1803 | `sitecore-sqldev:8.2.161221-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20161221/windowsservercore/sitecore-sqldev/Dockerfile) |
201203
| 8.2.161221 | sitecore | windowsservercore | 1803 | `sitecore:8.2.161221-windowsservercore-1803` [Dockerfile](images/8.2%20rev.%20161221/windowsservercore/sitecore/Dockerfile) |
202204
| ~~8.2.161221~~ | ~~sitecore-sqldev~~ | ~~windowsservercore~~ | ~~1709~~ | ~~`sitecore-sqldev:8.2.161221-windowsservercore-1709` [Dockerfile](images/8.2%20rev.%20161221/windowsservercore/sitecore-sqldev/Dockerfile)~~ |

images/8.2 rev. 180406/nanoserver-1803/sitecore-solr/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# escape=`
2-
FROM mcr.microsoft.com/dotnet/framework/aspnet:4.7.2-windowsservercore-1803 as builder
2+
ARG BUILD_IMAGE
3+
ARG BASE_IMAGE
4+
5+
FROM $BUILD_IMAGE as builder
36

47
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
58

@@ -34,7 +37,7 @@ RUN New-Item -Path 'c:/clean' -ItemType Directory | Out-Null; `
3437
Get-ChildItem -Path 'c:/solr/server/solr' | Foreach-Object { Copy-Item -Path $_.FullName -Destination 'c:/clean' -Recurse }
3538

3639
# Runtime image
37-
FROM sitecore-openjdk:8-nanoserver-1803 as final
40+
FROM $BASE_IMAGE
3841

3942
COPY --from=builder /solr /solr
4043
COPY --from=builder /clean /clean
@@ -56,4 +59,4 @@ EXPOSE 8983
5659
# Boot
5760
COPY Boot.cmd .
5861

59-
CMD Boot.cmd c:\\solr 8983 c:\\clean c:\\data
62+
CMD Boot.cmd c:\\solr 8983 c:\\clean c:\\data
Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
{
2-
"tag": "sitecore-solr:8.2.180406-nanoserver-1803"
2+
"tags": [
3+
{
4+
"build-options": [
5+
"--build-arg BUILD_IMAGE=mcr.microsoft.com/dotnet/framework/aspnet:4.7.2-windowsservercore-1803",
6+
"--build-arg BASE_IMAGE=sitecore-openjdk:8-nanoserver-1803"
7+
],
8+
"tag": "sitecore-solr:8.2.180406-nanoserver-1803"
9+
}
10+
],
11+
"sources": []
312
}

images/8.2 rev. 180406/nanoserver-1809/sitecore-solr/MapDrive.cmd

Lines changed: 0 additions & 3 deletions
This file was deleted.

images/8.2 rev. 180406/nanoserver-1809/sitecore-solr/build.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

images/8.2 rev. 180406/nanoserver-1809/sitecore-solr/Boot.cmd renamed to images/8.2 rev. 180406/nanoserver/sitecore-solr/Boot.cmd

File renamed without changes.

images/8.2 rev. 180406/nanoserver-1809/sitecore-solr/Dockerfile renamed to images/8.2 rev. 180406/nanoserver/sitecore-solr/Dockerfile

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# escape=`
2-
FROM mcr.microsoft.com/dotnet/framework/aspnet:4.7.2-windowsservercore-ltsc2019 as builder
2+
ARG BUILD_IMAGE
3+
ARG BASE_IMAGE
4+
5+
FROM $BUILD_IMAGE as builder
36

47
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
58

@@ -33,27 +36,20 @@ COPY schema.xml 'c:/solr/server/solr/configsets/basic_configs/conf'
3336
RUN New-Item -Path 'c:/clean' -ItemType Directory | Out-Null; `
3437
Get-ChildItem -Path 'c:/solr/server/solr' | Foreach-Object { Copy-Item -Path $_.FullName -Destination 'c:/clean' -Recurse }
3538

36-
# Runtime image
37-
FROM sitecore-openjdk:8-nanoserver-1809 as final
39+
FROM $BASE_IMAGE
40+
41+
USER ContainerAdministrator
3842

3943
COPY --from=builder /solr /solr
4044
COPY --from=builder /clean /clean
4145
COPY --from=builder /windows/system32/find.exe /windows/system32/
42-
COPY MapDrive.cmd MapDrive.cmd
4346

44-
VOLUME c:/data
45-
46-
# Workaround for java issues with Windows container symlinks: https://github.com/moby/moby/issues/27537#issuecomment-271546031
47-
USER ContainerAdministrator
48-
RUN MapDrive.cmd G:
47+
RUN MKDIR c:\\data
4948

50-
# Set solr home dir to above mapped drive
51-
ENV SOLR_HOME=G:/
49+
ENV SOLR_HOME=c:/data
5250

53-
# Expose default port
5451
EXPOSE 8983
5552

56-
# Boot
5753
COPY Boot.cmd .
5854

59-
CMD Boot.cmd c:\\solr 8983 c:\\clean c:\\data
55+
CMD Boot.cmd c:\\solr 8983 c:\\clean c:\\data
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"tags": [
3+
{
4+
"build-options": [
5+
"--build-arg BUILD_IMAGE=mcr.microsoft.com/dotnet/framework/aspnet:4.7.2-windowsservercore-ltsc2019",
6+
"--build-arg BASE_IMAGE=sitecore-openjdk:8-nanoserver-1809"
7+
],
8+
"tag": "sitecore-solr:8.2.180406-nanoserver-1809"
9+
}
10+
],
11+
"sources": []
12+
}

images/8.2 rev. 180406/nanoserver-1809/sitecore-solr/schema.xml renamed to images/8.2 rev. 180406/nanoserver/sitecore-solr/schema.xml

File renamed without changes.

images/8.2 rev. 180406/nanoserver-1809/sitecore-solr/solrconfig.xml renamed to images/8.2 rev. 180406/nanoserver/sitecore-solr/solrconfig.xml

File renamed without changes.

0 commit comments

Comments
 (0)