changeset 95:c17cdaf687e3

use debian:buster-slim to compile Windows binaries
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 15 Sep 2021 11:52:30 +0200
parents 8d9f935751fb
children 627b8a19fb9f
files Resources/Builders/Dockerfile-MinGW-BuildEnvironment Resources/Builders/MinGW32-Python2.7/docker-internal.sh Resources/Builders/MinGW32-Python3.7/docker-internal.sh Resources/Builders/MinGW32-Python3.8/docker-internal.sh Resources/Builders/MinGW64-Python2.7/docker-internal.sh Resources/Builders/MinGW64-Python3.7/docker-internal.sh Resources/Builders/MinGW64-Python3.8/docker-internal.sh
diffstat 7 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/Builders/Dockerfile-MinGW-BuildEnvironment	Tue Aug 31 14:11:05 2021 +0200
+++ b/Resources/Builders/Dockerfile-MinGW-BuildEnvironment	Wed Sep 15 11:52:30 2021 +0200
@@ -1,4 +1,6 @@
-FROM debian:stable-slim
+# 2021-09-15: We don't use "debian:bullseye-slim", as the "mercurial" package
+# fails to install on CBlue
+FROM debian:buster-slim
 
 MAINTAINER Sebastien Jodogne <s.jodogne@gmail.com>
 LABEL Description="Orthanc, free DICOM server" Vendor="The Orthanc project"
--- a/Resources/Builders/MinGW32-Python2.7/docker-internal.sh	Tue Aug 31 14:11:05 2021 +0200
+++ b/Resources/Builders/MinGW32-Python2.7/docker-internal.sh	Wed Sep 15 11:52:30 2021 +0200
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget http://orthanc.osimis.io/ThirdPartyDownloads/Python/python-2.7.17-win32.tar.bz2
+wget https://orthanc.osimis.io/ThirdPartyDownloads/Python/python-2.7.17-win32.tar.bz2
 tar xfj python-2.7.17-win32.tar.bz2
 
 cmake /tmp/source-writeable/ \
--- a/Resources/Builders/MinGW32-Python3.7/docker-internal.sh	Tue Aug 31 14:11:05 2021 +0200
+++ b/Resources/Builders/MinGW32-Python3.7/docker-internal.sh	Wed Sep 15 11:52:30 2021 +0200
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget http://orthanc.osimis.io/ThirdPartyDownloads/Python/python-3.7.7-win32.zip
+wget https://orthanc.osimis.io/ThirdPartyDownloads/Python/python-3.7.7-win32.zip
 unzip python-3.7.7-win32.zip
 
 cmake /tmp/source-writeable/ \
--- a/Resources/Builders/MinGW32-Python3.8/docker-internal.sh	Tue Aug 31 14:11:05 2021 +0200
+++ b/Resources/Builders/MinGW32-Python3.8/docker-internal.sh	Wed Sep 15 11:52:30 2021 +0200
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget http://orthanc.osimis.io/ThirdPartyDownloads/Python/python-3.8.3-win32.zip
+wget https://orthanc.osimis.io/ThirdPartyDownloads/Python/python-3.8.3-win32.zip
 unzip python-3.8.3-win32.zip
 
 if [ "$1" == "Release" ]; then
--- a/Resources/Builders/MinGW64-Python2.7/docker-internal.sh	Tue Aug 31 14:11:05 2021 +0200
+++ b/Resources/Builders/MinGW64-Python2.7/docker-internal.sh	Wed Sep 15 11:52:30 2021 +0200
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget http://orthanc.osimis.io/ThirdPartyDownloads/Python/python-2.7.17-win64.zip
+wget https://orthanc.osimis.io/ThirdPartyDownloads/Python/python-2.7.17-win64.zip
 unzip python-2.7.17-win64.zip
 
 cmake /tmp/source-writeable/ \
--- a/Resources/Builders/MinGW64-Python3.7/docker-internal.sh	Tue Aug 31 14:11:05 2021 +0200
+++ b/Resources/Builders/MinGW64-Python3.7/docker-internal.sh	Wed Sep 15 11:52:30 2021 +0200
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget http://orthanc.osimis.io/ThirdPartyDownloads/Python/python-3.7.7-win64.zip
+wget https://orthanc.osimis.io/ThirdPartyDownloads/Python/python-3.7.7-win64.zip
 unzip python-3.7.7-win64.zip
 
 cmake /tmp/source-writeable/ \
--- a/Resources/Builders/MinGW64-Python3.8/docker-internal.sh	Tue Aug 31 14:11:05 2021 +0200
+++ b/Resources/Builders/MinGW64-Python3.8/docker-internal.sh	Wed Sep 15 11:52:30 2021 +0200
@@ -10,7 +10,7 @@
 mkdir /tmp/build
 cd /tmp/build
 
-wget http://orthanc.osimis.io/ThirdPartyDownloads/Python/python-3.8.3-win64.zip
+wget https://orthanc.osimis.io/ThirdPartyDownloads/Python/python-3.8.3-win64.zip
 unzip python-3.8.3-win64.zip
 
 if [ "$1" == "Release" ]; then