always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker: debian-9 -> debian-10

Browse Source 
latest stable is debian-10
This commit is contained in:
Mizux Seiha
2020-01-09 18:55:16 +01:00
parent 90c54ef30e
commit 9d2e63ed9f
6 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/README.examples.python
View File

@@ -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:
```

4
tools/docker/Makefile
View File

@@ -38,7 +38,7 @@ help:
@echo
@echo -e "\t${BOLD}<distro>${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))

15
tools/docker/debian-9.Dockerfile → tools/docker/debian-10.Dockerfile
View File

@@ -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

4
tools/docker/test/debian-9/cc.Dockerfile → tools/docker/test/debian-10/cc.Dockerfile
View File

@@ -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 .

8
tools/docker/test/debian-9/dotnet.Dockerfile → tools/docker/test/debian-10/dotnet.Dockerfile
View File

@@ -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 .

4
tools/docker/test/debian-9/java.Dockerfile → tools/docker/test/debian-10/java.Dockerfile
View File

@@ -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 .