update docker to support ubuntu 19.10

google · Oct 11, 2019 · 6755c61 · 6755c61
1 parent 211c5b2
commit 6755c61
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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 → tools/docker/test/ubuntu-19.10/cc.Dockerfile b/tools/docker/test/ubuntu-18.10/cc.Dockerfile → 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/...ocker/test/ubuntu-18.10/dotnet.Dockerfile → ...ocker/test/ubuntu-19.10/dotnet.Dockerfile b/...ocker/test/ubuntu-18.10/dotnet.Dockerfile → ...ocker/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/.../docker/test/ubuntu-18.10/java.Dockerfile → .../docker/test/ubuntu-19.10/java.Dockerfile b/.../docker/test/ubuntu-18.10/java.Dockerfile → .../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 .