Skip to content

Commit 81692e2

Browse files
tianontianon
authored
Merge pull request docker-library#379 from sunghwan2789/move-windows-repository
Add support for Windows Server 1803, 1809
2 parents 65a048b + d341bb3 commit 81692e2

File tree

17 files changed

+468
-48
lines changed

17 files changed

+468
-48
lines changed

‎.travis.yml

Lines changed: 72 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,84 @@
11
language: bash
22
services: docker
33

4-
env:
5-
- VERSION=3.7 VARIANT=stretch
6-
- VERSION=3.7 VARIANT=stretch/slim
7-
- VERSION=3.7 VARIANT=alpine3.9
8-
- VERSION=3.7 VARIANT=alpine3.8
9-
- VERSION=3.6 VARIANT=stretch
10-
- VERSION=3.6 VARIANT=stretch/slim
11-
- VERSION=3.6 VARIANT=jessie
12-
- VERSION=3.6 VARIANT=jessie/slim
13-
- VERSION=3.6 VARIANT=alpine3.9
14-
- VERSION=3.6 VARIANT=alpine3.8
15-
- VERSION=3.5 VARIANT=stretch
16-
- VERSION=3.5 VARIANT=stretch/slim
17-
- VERSION=3.5 VARIANT=jessie
18-
- VERSION=3.5 VARIANT=jessie/slim
19-
- VERSION=3.5 VARIANT=alpine3.9
20-
- VERSION=3.5 VARIANT=alpine3.8
21-
- VERSION=3.4 VARIANT=stretch
22-
- VERSION=3.4 VARIANT=stretch/slim
23-
- VERSION=3.4 VARIANT=jessie
24-
- VERSION=3.4 VARIANT=jessie/slim
25-
- VERSION=3.4 VARIANT=wheezy
26-
- VERSION=3.4 VARIANT=alpine3.9
27-
- VERSION=3.4 VARIANT=alpine3.8
28-
- VERSION=2.7 VARIANT=stretch
29-
- VERSION=2.7 VARIANT=stretch/slim
30-
- VERSION=2.7 VARIANT=jessie
31-
- VERSION=2.7 VARIANT=jessie/slim
32-
- VERSION=2.7 VARIANT=wheezy
33-
- VERSION=2.7 VARIANT=alpine3.9
34-
- VERSION=2.7 VARIANT=alpine3.8
4+
matrix:
5+
include:
6+
- os: windows
7+
dist: 1803-containers
8+
env: VERSION=3.7 VARIANT=windows/windowsservercore-1803
9+
- os: linux
10+
env: VERSION=3.7 VARIANT=stretch
11+
- os: linux
12+
env: VERSION=3.7 VARIANT=stretch/slim
13+
- os: linux
14+
env: VERSION=3.7 VARIANT=alpine3.9
15+
- os: linux
16+
env: VERSION=3.7 VARIANT=alpine3.8
17+
- os: windows
18+
dist: 1803-containers
19+
env: VERSION=3.6 VARIANT=windows/windowsservercore-1803
20+
- os: linux
21+
env: VERSION=3.6 VARIANT=stretch
22+
- os: linux
23+
env: VERSION=3.6 VARIANT=stretch/slim
24+
- os: linux
25+
env: VERSION=3.6 VARIANT=jessie
26+
- os: linux
27+
env: VERSION=3.6 VARIANT=jessie/slim
28+
- os: linux
29+
env: VERSION=3.6 VARIANT=alpine3.9
30+
- os: linux
31+
env: VERSION=3.6 VARIANT=alpine3.8
32+
- os: linux
33+
env: VERSION=3.5 VARIANT=stretch
34+
- os: linux
35+
env: VERSION=3.5 VARIANT=stretch/slim
36+
- os: linux
37+
env: VERSION=3.5 VARIANT=jessie
38+
- os: linux
39+
env: VERSION=3.5 VARIANT=jessie/slim
40+
- os: linux
41+
env: VERSION=3.5 VARIANT=alpine3.9
42+
- os: linux
43+
env: VERSION=3.5 VARIANT=alpine3.8
44+
- os: linux
45+
env: VERSION=3.4 VARIANT=stretch
46+
- os: linux
47+
env: VERSION=3.4 VARIANT=stretch/slim
48+
- os: linux
49+
env: VERSION=3.4 VARIANT=jessie
50+
- os: linux
51+
env: VERSION=3.4 VARIANT=jessie/slim
52+
- os: linux
53+
env: VERSION=3.4 VARIANT=wheezy
54+
- os: linux
55+
env: VERSION=3.4 VARIANT=alpine3.9
56+
- os: linux
57+
env: VERSION=3.4 VARIANT=alpine3.8
58+
- os: windows
59+
dist: 1803-containers
60+
env: VERSION=2.7 VARIANT=windows/windowsservercore-1803
61+
- os: linux
62+
env: VERSION=2.7 VARIANT=stretch
63+
- os: linux
64+
env: VERSION=2.7 VARIANT=stretch/slim
65+
- os: linux
66+
env: VERSION=2.7 VARIANT=jessie
67+
- os: linux
68+
env: VERSION=2.7 VARIANT=jessie/slim
69+
- os: linux
70+
env: VERSION=2.7 VARIANT=wheezy
71+
- os: linux
72+
env: VERSION=2.7 VARIANT=alpine3.9
73+
- os: linux
74+
env: VERSION=2.7 VARIANT=alpine3.8
3575

3676
install:
3777
- git clone https://github.com/docker-library/official-images.git ~/official-images
78+
- if [ "$TRAVIS_OS_NAME" = 'linux' ]; then wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash; fi
3879

3980
before_script:
4081
- env | sort
41-
- wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
4282
- cd "$VERSION/$VARIANT"
4383
- slash='/'; image="python:${VERSION}-${VARIANT//$slash/-}"
4484

‎2.7/windows/windowsservercore-1709/Dockerfile

Lines changed: 1 addition & 1 deletion
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

‎2.7/windows/windowsservercore-1803/Dockerfile

Lines changed: 64 additions & 0 deletions
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"]

‎2.7/windows/windowsservercore-1809/Dockerfile

Lines changed: 64 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

‎3.6/windows/windowsservercore-1803/Dockerfile

Lines changed: 62 additions & 0 deletions
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"]

‎3.6/windows/windowsservercore-1809/Dockerfile

Lines changed: 62 additions & 0 deletions
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"]

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy