From 6755c61315c7bb382a558b27cdff7ea2d5970c9c Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@google.com>
Date: Fri, 11 Oct 2019 15:26:25 +0200
Subject: [PATCH] update docker to support ubuntu 19.10

---
 tools/docker/Makefile                                         | 2 +-
 .../docker/test/{ubuntu-18.10 => ubuntu-19.10}/cc.Dockerfile  | 4 ++--
 .../test/{ubuntu-18.10 => ubuntu-19.10}/dotnet.Dockerfile     | 4 ++--
 .../test/{ubuntu-18.10 => ubuntu-19.10}/java.Dockerfile       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename tools/docker/test/{ubuntu-18.10 => ubuntu-19.10}/cc.Dockerfile (82%)
 rename tools/docker/test/{ubuntu-18.10 => ubuntu-19.10}/dotnet.Dockerfile (91%)
 rename tools/docker/test/{ubuntu-18.10 => ubuntu-19.10}/java.Dockerfile (83%)

diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index ba8d3b1bec8..94e8bb35914 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -128,7 +128,7 @@ export/python: | export
 #################
 
 # Currently supported distro
-DISTROS = centos-7 debian-9 ubuntu-19.04 ubuntu-18.04 ubuntu-16.04
+DISTROS = centos-7 debian-9 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/test/ubuntu-18.10/cc.Dockerfile b/tools/docker/test/ubuntu-19.10/cc.Dockerfile
similarity index 82%
rename from tools/docker/test/ubuntu-18.10/cc.Dockerfile
rename to tools/docker/test/ubuntu-19.10/cc.Dockerfile
index 00ae4e74bae..126a627844a 100644
--- a/tools/docker/test/ubuntu-18.10/cc.Dockerfile
+++ b/tools/docker/test/ubuntu-19.10/cc.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.10
+FROM ubuntu:19.10
 
 RUN apt-get update \
 && apt-get install -y -q build-essential zlib1g-dev \
@@ -9,4 +9,4 @@ RUN apt-get update \
 #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 WORKDIR /root
-ADD or-tools_ubuntu-18.10_v*.tar.gz .
+ADD or-tools_ubuntu-19.10_v*.tar.gz .
diff --git a/tools/docker/test/ubuntu-18.10/dotnet.Dockerfile b/tools/docker/test/ubuntu-19.10/dotnet.Dockerfile
similarity index 91%
rename from tools/docker/test/ubuntu-18.10/dotnet.Dockerfile
rename to tools/docker/test/ubuntu-19.10/dotnet.Dockerfile
index fa1ff4ea2a3..028ae82ba16 100644
--- a/tools/docker/test/ubuntu-18.10/dotnet.Dockerfile
+++ b/tools/docker/test/ubuntu-19.10/dotnet.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.10
+FROM ubuntu:19.10
 
 RUN apt-get update -qq \
 && apt-get install -yq build-essential zlib1g-dev \
@@ -19,4 +19,4 @@ RUN apt-get update -qq \
 #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 WORKDIR /root
-ADD or-tools_ubuntu-18.10_v*.tar.gz .
+ADD or-tools_ubuntu-19.10_v*.tar.gz .
diff --git a/tools/docker/test/ubuntu-18.10/java.Dockerfile b/tools/docker/test/ubuntu-19.10/java.Dockerfile
similarity index 83%
rename from tools/docker/test/ubuntu-18.10/java.Dockerfile
rename to tools/docker/test/ubuntu-19.10/java.Dockerfile
index 73d0459e66d..f08f160b63a 100644
--- a/tools/docker/test/ubuntu-18.10/java.Dockerfile
+++ b/tools/docker/test/ubuntu-19.10/java.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.10
+FROM ubuntu:19.10
 
 RUN apt-get update -qq \
 && apt-get install -y -q build-essential zlib1g-dev default-jdk \
@@ -9,4 +9,4 @@ RUN apt-get update -qq \
 #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 WORKDIR /root
-ADD or-tools_ubuntu-18.10_v*.tar.gz .
+ADD or-tools_ubuntu-19.10_v*.tar.gz .