From 9d2e63ed9f1a993ab24b00adc02781a08655609d Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Thu, 9 Jan 2020 18:55:16 +0100 Subject: [PATCH] docker: debian-9 -> debian-10 latest stable is debian-10 --- tools/README.examples.python | 6 ++++-- tools/docker/Makefile | 4 ++-- .../{debian-9.Dockerfile => debian-10.Dockerfile} | 15 +++------------ .../test/{debian-9 => debian-10}/cc.Dockerfile | 4 ++-- .../{debian-9 => debian-10}/dotnet.Dockerfile | 8 ++++---- .../test/{debian-9 => debian-10}/java.Dockerfile | 4 ++-- 6 files changed, 17 insertions(+), 24 deletions(-) rename tools/docker/{debian-9.Dockerfile => debian-10.Dockerfile} (72%) rename tools/docker/test/{debian-9 => debian-10}/cc.Dockerfile (86%) rename tools/docker/test/{debian-9 => debian-10}/dotnet.Dockerfile (81%) rename tools/docker/test/{debian-9 => debian-10}/java.Dockerfile (86%) diff --git a/tools/README.examples.python b/tools/README.examples.python index b3c7c76eae..e61a3fbe1f 100644 --- a/tools/README.examples.python +++ b/tools/README.examples.python @@ -8,9 +8,11 @@ Full installation instructions are located [here](https://developers.google.com/optimization/install/python/) These modules have been tested under: - - Ubuntu 14.04 and up, CentOS 7, Debian 9. + - Ubuntu 16.04 LTS, 18.04 LTS and 19.10 (64 bit). + - CentOS 7 (64 bit). + - Debian 10 (64 bit). - Mac OS X El Capitan with Xcode 7.x (64 bit). - - Microsoft Windows with Visual Studio 2015 and 2017 (64-bit) + - Microsoft Windows with Visual Studio 2019 (64-bit) Upon decompressing the archive, you will get the following structure: ``` diff --git a/tools/docker/Makefile b/tools/docker/Makefile index 94e8bb3591..11351be832 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -38,7 +38,7 @@ help: @echo @echo -e "\t${BOLD}${RESET}:" @echo -e "\t\t${BOLD}centos-7${RESET} (latest)" - @echo -e "\t\t${BOLD}debian-9${RESET} (latest)" + @echo -e "\t\t${BOLD}debian-10${RESET} (latest)" @echo -e "\t\t${BOLD}ubuntu-19.04${RESET} (Ubuntu latest)" @echo -e "\t\t${BOLD}ubuntu-18.04${RESET} (Ubuntu 18.04 LTS)" @echo -e "\t\t${BOLD}ubuntu-16.04${RESET} (Ubuntu 16.04 LTS)" @@ -128,7 +128,7 @@ export/python: | export ################# # Currently supported distro -DISTROS = centos-7 debian-9 ubuntu-19.10 ubuntu-18.04 ubuntu-16.04 +DISTROS = centos-7 debian-10 ubuntu-19.10 ubuntu-18.04 ubuntu-16.04 # Create build docker images with OR-Tools built targets = $(addprefix docker_, $(DISTROS)) diff --git a/tools/docker/debian-9.Dockerfile b/tools/docker/debian-10.Dockerfile similarity index 72% rename from tools/docker/debian-9.Dockerfile rename to tools/docker/debian-10.Dockerfile index 1b3a2980a4..2f6ead5a65 100644 --- a/tools/docker/debian-9.Dockerfile +++ b/tools/docker/debian-10.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:9 +FROM debian:10 ############# ## SETUP ## @@ -16,22 +16,13 @@ RUN apt-get update -qq \ && apt-get install -qq gpg apt-transport-https \ && wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \ && mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \ -&& wget -q https://packages.microsoft.com/config/debian/9/prod.list \ +&& wget -q https://packages.microsoft.com/config/debian/10/prod.list \ && mv prod.list /etc/apt/sources.list.d/microsoft-prod.list \ && apt-get update -qq \ -&& apt-get install -qq dotnet-sdk-2.2 \ +&& apt-get install -qq dotnet-sdk-3.1 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -# Mono Install -#RUN apt-get install -qq apt-transport-https dirmngr \ -#&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \ -#&& echo "deb https://download.mono-project.com/repo/debian stable-stretch main" | tee /etc/apt/sources.list.d/mono-official-stable.list \ -#&& apt-get update -qq \ -#&& apt-get install -qq mono-complete \ -#&& apt-get clean \ -#&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/docker/test/debian-9/cc.Dockerfile b/tools/docker/test/debian-10/cc.Dockerfile similarity index 86% rename from tools/docker/test/debian-9/cc.Dockerfile rename to tools/docker/test/debian-10/cc.Dockerfile index 2d8a2bf002..1858b88f17 100644 --- a/tools/docker/test/debian-9/cc.Dockerfile +++ b/tools/docker/test/debian-10/cc.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:9 +FROM debian:10 LABEL maintainer="corentinl@google.com" RUN apt-get update \ @@ -10,4 +10,4 @@ RUN apt-get update \ #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone WORKDIR /root -ADD or-tools_debian-9_v*.tar.gz . +ADD or-tools_debian-10_v*.tar.gz . diff --git a/tools/docker/test/debian-9/dotnet.Dockerfile b/tools/docker/test/debian-10/dotnet.Dockerfile similarity index 81% rename from tools/docker/test/debian-9/dotnet.Dockerfile rename to tools/docker/test/debian-10/dotnet.Dockerfile index 8c88d90b5b..a9cd0ec6a1 100644 --- a/tools/docker/test/debian-9/dotnet.Dockerfile +++ b/tools/docker/test/debian-10/dotnet.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:9 +FROM debian:10 LABEL maintainer="corentinl@google.com" RUN apt-get update \ @@ -11,10 +11,10 @@ RUN apt-get update -qq \ && apt-get install -qq wget gpg apt-transport-https \ && wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \ && mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \ -&& wget -q https://packages.microsoft.com/config/debian/9/prod.list \ +&& wget -q https://packages.microsoft.com/config/debian/10/prod.list \ && mv prod.list /etc/apt/sources.list.d/microsoft-prod.list \ && apt-get update \ -&& apt-get install -y -q dotnet-sdk-2.1 \ +&& apt-get install -y -q dotnet-sdk-3.1 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -22,4 +22,4 @@ RUN apt-get update -qq \ #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone WORKDIR /root -ADD or-tools_debian-9_v*.tar.gz . +ADD or-tools_debian-10_v*.tar.gz . diff --git a/tools/docker/test/debian-9/java.Dockerfile b/tools/docker/test/debian-10/java.Dockerfile similarity index 86% rename from tools/docker/test/debian-9/java.Dockerfile rename to tools/docker/test/debian-10/java.Dockerfile index d426afb598..05c5fdad91 100644 --- a/tools/docker/test/debian-9/java.Dockerfile +++ b/tools/docker/test/debian-10/java.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:9 +FROM debian:10 LABEL maintainer="corentinl@google.com" RUN apt-get update \ @@ -10,4 +10,4 @@ RUN apt-get update \ #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone WORKDIR /root -ADD or-tools_debian-9_v*.tar.gz . +ADD or-tools_debian-10_v*.tar.gz .