docker: Use external snk file when building artifact

You must have a or-tools.snk file in ortools/tools/docker directory
This commit is contained in:
Corentin Le Molgat
2018-11-19 17:36:48 +01:00
parent 9e70774073
commit d79ea4b0a4
7 changed files with 25 additions and 0 deletions

View File

@@ -116,6 +116,7 @@ docker_ubuntu-18.04: export/ubuntu-18.04/docker.tar
# before the image is built...
export/%/docker.tar: %.Dockerfile ../Makefile.cc.java.dotnet ../../makefiles ../../ortools | export/%
-docker image rm -f or-tools_$*:devel 2>/dev/null
cp or-tools.snk export/$*/
$(DOCKER_BUILD_CMD) \
-f $< \
--build-arg SRC_GIT_BRANCH=$(OR_TOOLS_BRANCH) \

View File

@@ -45,6 +45,10 @@ RUN wget "https://downloads.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3
ENV TZ=America/Los_Angeles
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Copy the snk key
COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
################
## OR-TOOLS ##
################

View File

@@ -37,6 +37,10 @@ RUN apt-get update -qq \
ENV TZ=America/Los_Angeles
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Copy the snk key
COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
################
## OR-TOOLS ##
################

View File

@@ -43,6 +43,10 @@ RUN apt-get update -qq \
ENV TZ=America/Los_Angeles
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Copy the snk key
COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
################
## OR-TOOLS ##
################

View File

@@ -43,6 +43,10 @@ RUN apt-get update -qq \
ENV TZ=America/Los_Angeles
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Copy the snk key
COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
################
## OR-TOOLS ##
################

View File

@@ -43,6 +43,10 @@ RUN apt-get update -qq \
ENV TZ=America/Los_Angeles
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Copy the snk key
COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
################
## OR-TOOLS ##
################

View File

@@ -45,6 +45,10 @@ RUN apt-get update -qq \
ENV TZ=America/Los_Angeles
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Copy the snk key
COPY or-tools.snk /root/or-tools.snk
ENV DOTNET_SNK=/root/or-tools.snk
################
## OR-TOOLS ##
################