Skip to content

Commit 28511e3

Browse files
committed
Add support for Windows Server 1803, 1809
1 parent 5ee90be commit 28511e3

File tree

14 files changed

+396
-8
lines changed

14 files changed

+396
-8
lines changed

.appveyor.yml

+9
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,19 @@ environment:
55
matrix:
66
- version: 3.7
77
variant: windowsservercore-ltsc2016
8+
- os: windows
9+
dist: 1803-containers
10+
env: VERSION=3.7 VARIANT=windowsservercore-1803
811
- version: 3.6
912
variant: windowsservercore-ltsc2016
13+
- os: windows
14+
dist: 1803-containers
15+
env: VERSION=3.6 VARIANT=windowsservercore-1803
1016
- version: 2.7
1117
variant: windowsservercore-ltsc2016
18+
- os: windows
19+
dist: 1803-containers
20+
env: VERSION=2.7 VARIANT=windowsservercore-1803
1221

1322
install:
1423
- ps: |

2.7/windows/windowsservercore-1709/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM microsoft/windowsservercore:1709
7+
FROM mcr.microsoft.com/windows/servercore:1709
88

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

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM mcr.microsoft.com/windows/servercore:1803
8+
9+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
10+
11+
ENV PYTHON_VERSION 2.7.15
12+
ENV PYTHON_RELEASE 2.7.15
13+
14+
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
15+
Write-Host ('Downloading {0} ...' -f $url); \
16+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
17+
Invoke-WebRequest -Uri $url -OutFile 'python.msi'; \
18+
\
19+
Write-Host 'Installing ...'; \
20+
# https://www.python.org/download/releases/2.4/msi/
21+
Start-Process msiexec -Wait \
22+
-ArgumentList @( \
23+
'/i', \
24+
'python.msi', \
25+
'/quiet', \
26+
'/qn', \
27+
'TARGETDIR=C:\Python', \
28+
'ALLUSERS=1', \
29+
'ADDLOCAL=DefaultFeature,Extensions,TclTk,Tools,PrependPath' \
30+
); \
31+
\
32+
# the installer updated PATH, so we should refresh our local value
33+
$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
34+
\
35+
Write-Host 'Verifying install ...'; \
36+
Write-Host ' python --version'; python --version; \
37+
\
38+
Write-Host 'Removing ...'; \
39+
Remove-Item python.msi -Force; \
40+
\
41+
Write-Host 'Complete.';
42+
43+
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
44+
ENV PYTHON_PIP_VERSION 19.0.2
45+
46+
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
47+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
48+
Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
49+
python get-pip.py \
50+
--disable-pip-version-check \
51+
--no-cache-dir \
52+
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
53+
; \
54+
Remove-Item get-pip.py -Force; \
55+
\
56+
Write-Host 'Verifying pip install ...'; \
57+
pip --version; \
58+
\
59+
Write-Host 'Complete.';
60+
61+
# install "virtualenv", since the vast majority of users of this image will want it
62+
RUN pip install --no-cache-dir virtualenv
63+
64+
CMD ["python"]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM mcr.microsoft.com/windows/servercore:1809
8+
9+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
10+
11+
ENV PYTHON_VERSION 2.7.15
12+
ENV PYTHON_RELEASE 2.7.15
13+
14+
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
15+
Write-Host ('Downloading {0} ...' -f $url); \
16+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
17+
Invoke-WebRequest -Uri $url -OutFile 'python.msi'; \
18+
\
19+
Write-Host 'Installing ...'; \
20+
# https://www.python.org/download/releases/2.4/msi/
21+
Start-Process msiexec -Wait \
22+
-ArgumentList @( \
23+
'/i', \
24+
'python.msi', \
25+
'/quiet', \
26+
'/qn', \
27+
'TARGETDIR=C:\Python', \
28+
'ALLUSERS=1', \
29+
'ADDLOCAL=DefaultFeature,Extensions,TclTk,Tools,PrependPath' \
30+
); \
31+
\
32+
# the installer updated PATH, so we should refresh our local value
33+
$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
34+
\
35+
Write-Host 'Verifying install ...'; \
36+
Write-Host ' python --version'; python --version; \
37+
\
38+
Write-Host 'Removing ...'; \
39+
Remove-Item python.msi -Force; \
40+
\
41+
Write-Host 'Complete.';
42+
43+
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
44+
ENV PYTHON_PIP_VERSION 19.0.2
45+
46+
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
47+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
48+
Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
49+
python get-pip.py \
50+
--disable-pip-version-check \
51+
--no-cache-dir \
52+
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
53+
; \
54+
Remove-Item get-pip.py -Force; \
55+
\
56+
Write-Host 'Verifying pip install ...'; \
57+
pip --version; \
58+
\
59+
Write-Host 'Complete.';
60+
61+
# install "virtualenv", since the vast majority of users of this image will want it
62+
RUN pip install --no-cache-dir virtualenv
63+
64+
CMD ["python"]

2.7/windows/windowsservercore-ltsc2016/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM microsoft/windowsservercore:ltsc2016
7+
FROM mcr.microsoft.com/windows/servercore:ltsc2016
88

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

3.6/windows/windowsservercore-1709/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM microsoft/windowsservercore:1709
7+
FROM mcr.microsoft.com/windows/servercore:1709
88

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

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM mcr.microsoft.com/windows/servercore:1803
8+
9+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
10+
11+
ENV PYTHON_VERSION 3.6.8
12+
ENV PYTHON_RELEASE 3.6.8
13+
14+
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
15+
Write-Host ('Downloading {0} ...' -f $url); \
16+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
17+
Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
18+
\
19+
Write-Host 'Installing ...'; \
20+
# https://docs.python.org/3.5/using/windows.html#installing-without-ui
21+
Start-Process python.exe -Wait \
22+
-ArgumentList @( \
23+
'/quiet', \
24+
'InstallAllUsers=1', \
25+
'TargetDir=C:\Python', \
26+
'PrependPath=1', \
27+
'Shortcuts=0', \
28+
'Include_doc=0', \
29+
'Include_pip=0', \
30+
'Include_test=0' \
31+
); \
32+
\
33+
# the installer updated PATH, so we should refresh our local value
34+
$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
35+
\
36+
Write-Host 'Verifying install ...'; \
37+
Write-Host ' python --version'; python --version; \
38+
\
39+
Write-Host 'Removing ...'; \
40+
Remove-Item python.exe -Force; \
41+
\
42+
Write-Host 'Complete.';
43+
44+
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
45+
ENV PYTHON_PIP_VERSION 19.0.2
46+
47+
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
48+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
49+
Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
50+
python get-pip.py \
51+
--disable-pip-version-check \
52+
--no-cache-dir \
53+
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
54+
; \
55+
Remove-Item get-pip.py -Force; \
56+
\
57+
Write-Host 'Verifying pip install ...'; \
58+
pip --version; \
59+
\
60+
Write-Host 'Complete.';
61+
62+
CMD ["python"]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM mcr.microsoft.com/windows/servercore:1809
8+
9+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
10+
11+
ENV PYTHON_VERSION 3.6.8
12+
ENV PYTHON_RELEASE 3.6.8
13+
14+
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
15+
Write-Host ('Downloading {0} ...' -f $url); \
16+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
17+
Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
18+
\
19+
Write-Host 'Installing ...'; \
20+
# https://docs.python.org/3.5/using/windows.html#installing-without-ui
21+
Start-Process python.exe -Wait \
22+
-ArgumentList @( \
23+
'/quiet', \
24+
'InstallAllUsers=1', \
25+
'TargetDir=C:\Python', \
26+
'PrependPath=1', \
27+
'Shortcuts=0', \
28+
'Include_doc=0', \
29+
'Include_pip=0', \
30+
'Include_test=0' \
31+
); \
32+
\
33+
# the installer updated PATH, so we should refresh our local value
34+
$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
35+
\
36+
Write-Host 'Verifying install ...'; \
37+
Write-Host ' python --version'; python --version; \
38+
\
39+
Write-Host 'Removing ...'; \
40+
Remove-Item python.exe -Force; \
41+
\
42+
Write-Host 'Complete.';
43+
44+
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
45+
ENV PYTHON_PIP_VERSION 19.0.2
46+
47+
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
48+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
49+
Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
50+
python get-pip.py \
51+
--disable-pip-version-check \
52+
--no-cache-dir \
53+
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
54+
; \
55+
Remove-Item get-pip.py -Force; \
56+
\
57+
Write-Host 'Verifying pip install ...'; \
58+
pip --version; \
59+
\
60+
Write-Host 'Complete.';
61+
62+
CMD ["python"]

3.6/windows/windowsservercore-ltsc2016/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM microsoft/windowsservercore:ltsc2016
7+
FROM mcr.microsoft.com/windows/servercore:ltsc2016
88

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

3.7/windows/windowsservercore-1709/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM microsoft/windowsservercore:1709
7+
FROM mcr.microsoft.com/windows/servercore:1709
88

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

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh"
3+
#
4+
# PLEASE DO NOT EDIT IT DIRECTLY.
5+
#
6+
7+
FROM mcr.microsoft.com/windows/servercore:1803
8+
9+
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
10+
11+
ENV PYTHON_VERSION 3.7.2
12+
ENV PYTHON_RELEASE 3.7.2
13+
14+
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
15+
Write-Host ('Downloading {0} ...' -f $url); \
16+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
17+
Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
18+
\
19+
Write-Host 'Installing ...'; \
20+
# https://docs.python.org/3.5/using/windows.html#installing-without-ui
21+
Start-Process python.exe -Wait \
22+
-ArgumentList @( \
23+
'/quiet', \
24+
'InstallAllUsers=1', \
25+
'TargetDir=C:\Python', \
26+
'PrependPath=1', \
27+
'Shortcuts=0', \
28+
'Include_doc=0', \
29+
'Include_pip=0', \
30+
'Include_test=0' \
31+
); \
32+
\
33+
# the installer updated PATH, so we should refresh our local value
34+
$env:PATH = [Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine); \
35+
\
36+
Write-Host 'Verifying install ...'; \
37+
Write-Host ' python --version'; python --version; \
38+
\
39+
Write-Host 'Removing ...'; \
40+
Remove-Item python.exe -Force; \
41+
\
42+
Write-Host 'Complete.';
43+
44+
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
45+
ENV PYTHON_PIP_VERSION 19.0.2
46+
47+
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
48+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
49+
Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
50+
python get-pip.py \
51+
--disable-pip-version-check \
52+
--no-cache-dir \
53+
('pip=={0}' -f $env:PYTHON_PIP_VERSION) \
54+
; \
55+
Remove-Item get-pip.py -Force; \
56+
\
57+
Write-Host 'Verifying pip install ...'; \
58+
pip --version; \
59+
\
60+
Write-Host 'Complete.';
61+
62+
CMD ["python"]

0 commit comments

Comments
 (0)