Update docker-library images #3559
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- `mariadb`: 10.3.2 - `python`: fix Windows builds (docker-library/python#228)
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 3f6bbdf..08c3f72 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -9,7 +9,7 @@ mariadb:10.1.28
mariadb:10.2
mariadb:10.2.9
mariadb:10.3
-mariadb:10.3.1
+mariadb:10.3.2
mariadb:latest
python:2-alpine
python:2-alpine3.4
diff --git a/mariadb_10.3/Dockerfile b/mariadb_10.3/Dockerfile
index 87bdb38..06b8e27 100644
--- a/mariadb_10.3/Dockerfile
+++ b/mariadb_10.3/Dockerfile
@@ -59,7 +59,7 @@ RUN echo "deb https://repo.percona.com/apt jessie main" > /etc/apt/sources.list.
} > /etc/apt/preferences.d/percona
ENV MARIADB_MAJOR 10.3
-ENV MARIADB_VERSION 10.3.1+maria~jessie
+ENV MARIADB_VERSION 10.3.2+maria~jessie
RUN echo "deb http://ftp.osuosl.org/pub/mariadb/repo/$MARIADB_MAJOR/debian jessie main" > /etc/apt/sources.list.d/mariadb.list \
&& { \
diff --git a/python_2-windowsservercore/Dockerfile b/python_2-windowsservercore/Dockerfile
index d54a78e..205d474 100644
--- a/python_2-windowsservercore/Dockerfile
+++ b/python_2-windowsservercore/Dockerfile
@@ -1,13 +1,13 @@
FROM microsoft/windowsservercore
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ENV PYTHON_VERSION 2.7.14
ENV PYTHON_RELEASE 2.7.14
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
Write-Host ('Downloading {0} ...' -f $url); \
- (New-Object System.Net.WebClient).DownloadFile($url, 'python.msi'); \
+ Invoke-WebRequest -Uri $url -OutFile 'python.msi'; \
\
Write-Host 'Installing ...'; \
# https://www.python.org/download/releases/2.4/msi/
@@ -37,7 +37,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env
ENV PYTHON_PIP_VERSION 9.0.1
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
- (New-Object System.Net.WebClient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'get-pip.py'); \
+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+ Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
python get-pip.py \
--disable-pip-version-check \
--no-cache-dir \
diff --git a/python_3.5-windowsservercore/Dockerfile b/python_3.5-windowsservercore/Dockerfile
index d7f1404..abdbde6 100644
--- a/python_3.5-windowsservercore/Dockerfile
+++ b/python_3.5-windowsservercore/Dockerfile
@@ -6,14 +6,14 @@
FROM microsoft/windowsservercore
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ENV PYTHON_VERSION 3.5.4
ENV PYTHON_RELEASE 3.5.4
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
Write-Host ('Downloading {0} ...' -f $url); \
- (New-Object System.Net.WebClient).DownloadFile($url, 'python.exe'); \
+ Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
\
Write-Host 'Installing ...'; \
# https://docs.python.org/3.5/using/windows.html#installing-without-ui
@@ -44,7 +44,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
ENV PYTHON_PIP_VERSION 9.0.1
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
- (New-Object System.Net.WebClient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'get-pip.py'); \
+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+ Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
python get-pip.py \
--disable-pip-version-check \
--no-cache-dir \
diff --git a/python_rc-windowsservercore/Dockerfile b/python_rc-windowsservercore/Dockerfile
index b8be6c1..a536645 100644
--- a/python_rc-windowsservercore/Dockerfile
+++ b/python_rc-windowsservercore/Dockerfile
@@ -6,14 +6,14 @@
FROM microsoft/windowsservercore
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ENV PYTHON_VERSION 3.7.0a1
ENV PYTHON_RELEASE 3.7.0
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
Write-Host ('Downloading {0} ...' -f $url); \
- (New-Object System.Net.WebClient).DownloadFile($url, 'python.exe'); \
+ Invoke-WebRequest -Uri $url -OutFile 'python.exe'; \
\
Write-Host 'Installing ...'; \
# https://docs.python.org/3.5/using/windows.html#installing-without-ui
@@ -44,7 +44,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
ENV PYTHON_PIP_VERSION 9.0.1
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
- (New-Object System.Net.WebClient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'get-pip.py'); \
+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+ Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'; \
python get-pip.py \
--disable-pip-version-check \
--no-cache-dir \
diff --git a/python_windowsservercore/Dockerfile b/python_windowsservercore/Dockerfile
index d0c5725..345462d 100644
--- a/python_windowsservercore/Dockerfile
+++ b/python_windowsservercore/Dockerfile
@@ -6,14 +6,14 @@
FROM microsoft/windowsservercore
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ENV PYTHON_VERSION 3.6.3
ENV PYTHON_RELEASE 3.6.3
RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
Write-Host ('Downloading {0} ...' -f $url); \
- (New-Object System.Net.WebClient).DownloadFile($url, 'python.exe'); \
+ Invoke-WebRequest -Uri $url -OutFile python.exe; \
\
Write-Host 'Installing ...'; \
# https://docs.python.org/3.5/using/windows.html#installing-without-ui
@@ -44,7 +44,8 @@ RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env
ENV PYTHON_PIP_VERSION 9.0.1
RUN Write-Host ('Installing pip=={0} ...' -f $env:PYTHON_PIP_VERSION); \
- (New-Object System.Net.WebClient).DownloadFile('https://bootstrap.pypa.io/get-pip.py', 'get-pip.py'); \
+ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+ Invoke-WebRequest -Uri https://bootstrap.pypa.io/get-pip.py -OutFile get-pip.py; \
python get-pip.py \
--disable-pip-version-check \
--no-cache-dir \ |
|
Build test of #3559; 8c7706d ( $ bashbrew build mariadb:10.3.2
Building bashbrew/cache:1868feb3e80a4f590e304ff6cc2303637cc1566d973947104cc1cc4c4c98a48e (mariadb:10.3.2)
Tagging mariadb:10.3.2
Tagging mariadb:10.3
$ test/run.sh mariadb:10.3.2
testing mariadb:10.3.2
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'mysql-basics' [5/7]......passed
'mysql-initdb' [6/7].......passed
'mysql-log-bin' [7/7].......passed
$ bashbrew build mariadb:10.2.9
Building bashbrew/cache:fb3dc6db13461033ae228af8e6432281f0dc24a7c25ed9f6a54a50e989648e60 (mariadb:10.2.9)
Tagging mariadb:10.2.9
Tagging mariadb:10.2
Tagging mariadb:10
Tagging mariadb:latest
$ test/run.sh mariadb:10.2.9
testing mariadb:10.2.9
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'mysql-basics' [5/7]........passed
'mysql-initdb' [6/7].......passed
'mysql-log-bin' [7/7].......passed
$ bashbrew build mariadb:10.1.28
Building bashbrew/cache:05807b9acf556e94ff4f10e91801ce0aa3176f479c1a384575892f60ae043cff (mariadb:10.1.28)
Tagging mariadb:10.1.28
Tagging mariadb:10.1
$ test/run.sh mariadb:10.1.28
testing mariadb:10.1.28
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'mysql-basics' [5/7].........passed
'mysql-initdb' [6/7]..........passed
'mysql-log-bin' [7/7].........passed
$ bashbrew build mariadb:10.0.32
Building bashbrew/cache:a7c0c28150a6939ef7e3c97614e810df2cff16be425bdb7f55f1786d42f111bd (mariadb:10.0.32)
Tagging mariadb:10.0.32
Tagging mariadb:10.0
$ test/run.sh mariadb:10.0.32
testing mariadb:10.0.32
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'mysql-basics' [5/7]........passed
'mysql-initdb' [6/7]........passed
'mysql-log-bin' [7/7]........passed
$ bashbrew build mariadb:5.5.57
Building bashbrew/cache:63759e2d30ad4984a26ef201711b28f553f973d47ed9be9ab5682662320eb040 (mariadb:5.5.57)
Tagging mariadb:5.5.57
Tagging mariadb:5.5
Tagging mariadb:5
$ test/run.sh mariadb:5.5.57
testing mariadb:5.5.57
'utc' [1/7]...passed
'cve-2014--shellshock' [2/7]...passed
'no-hard-coded-passwords' [3/7]...passed
'override-cmd' [4/7]...passed
'mysql-basics' [5/7]......passed
'mysql-initdb' [6/7]......passed
'mysql-log-bin' [7/7].......passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
mariadb: 10.3.2python: fix Windows builds (Use TLS 1.2 in Windows builds python#228)