From dcce2a63bc953287de82dd02f447924b82c00a56 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Wed, 12 Jul 2017 16:14:53 -0700 Subject: [PATCH] improve makefile for docker --- tools/docker/Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/docker/Makefile b/tools/docker/Makefile index d98fde0054..58838e43ec 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -13,6 +13,8 @@ clean_all_images: clean_all_containers: docker rm `docker ps -a -q` +delivery: ubuntu-16.04-archive ubuntu-16.04-pypi ubuntu-16.04-pypi3 + # Ubuntu 14.04 images ubuntu-14.04-image: @@ -29,16 +31,16 @@ ubuntu-16.04-image: ubuntu-16.04-image-no-cache: docker build --no-cache -f ubuntu-16.04.Dockerfile -t or-tools-ubuntu-16.04-image . -ubuntu-16.04-archive: export +ubuntu-16.04-archive: export ubuntu-16.04-image docker run -w /root/or-tools -v `pwd`/export:/export or-tools-ubuntu-16.04-image:latest /bin/bash -c "git pull; make clean; make all -j 5; make test; make archive python_examples_archive; cp *.tar.gz /export" -ubuntu-16.04-pypi: +ubuntu-16.04-pypi: export ubuntu-16.04-image docker run -w /root/or-tools -v `pwd`/export:/export or-tools-ubuntu-16.04-image:latest /bin/bash -c "git pull; make clean; make python -j 5; make test_python; make pypi_export" -ubuntu-16.04-pypi3: +ubuntu-16.04-pypi3: export ubuntu-16.04-image docker run -w /root/or-tools -v `pwd`/export:/export or-tools-ubuntu-16.04-image:latest /bin/bash -c "git pull; sed -i -e 's/2.7/3.5/g' Makefile.local; make clean; make python -j 5; make test_python; make pypi_export" -ubuntu-16.04-bash: +ubuntu-16.04-bash: ubuntu-16.04-image docker run -w /root/or-tools -v `pwd`/export:/export -it or-tools-ubuntu-16.04-image:latest /bin/bash # Ubuntu 17.04 images @@ -49,11 +51,11 @@ ubuntu-17.04-image: ubuntu-17.04-image-no-cache: docker build --no-cache -f ubuntu-17.04.Dockerfile -t or-tools-ubuntu-17.04-image . -ubuntu-17.04-archive: export +ubuntu-17.04-archive: export ubuntu-17.04-image docker run -w /root/or-tools -v `pwd`/export:/export or-tools-ubuntu-17.04-image:latest /bin/bash -c "git pull; pwd; make clean; make all -j 5; make test; make archive; cp *.tar.gz /export" -ubuntu-17.04-pypi: +ubuntu-17.04-pypi: export ubuntu-17.04-image docker run -w /root/or-tools -v `pwd`/export:/export or-tools-ubuntu-17.04-image:latest /bin/bash -c "git pull; make clean; make python -j 5; make test_python; make pypi_export" -ubuntu-17.04-pypi3: +ubuntu-17.04-pypi3: export ubuntu-17.04-image docker run -w /root/or-tools -v `pwd`/export:/export or-tools-ubuntu-17.04-image:latest /bin/bash -c "git pull; sed -i -e 's/2.7/3.5/g' Makefile.local; make clean; make python -j 5; make test_python; make pypi_export"