From 13981cef8699ba91329c3743daeabd9fb81a8b58 Mon Sep 17 00:00:00 2001 From: Riccardo Biraghi Date: Mon, 23 Apr 2018 17:27:13 +0100 Subject: [PATCH] Set DOCKER_API_VERSION in DOCKER_DOWNGRADE --- .travis.yml | 15 ++++++++++++--- test.out | 0 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 test.out diff --git a/.travis.yml b/.travis.yml index 00488c7..13ea98b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,18 @@ cache: directories: - downloads -env: - - DOCKER_DOWNGRADE="echo nothing to be done" - - DOCKER_API_VERSION="1.24" DOCKER_DOWNGRADE="docker save -o images.tar mqadvanced-server-dev mq-dev-jms-test && sudo apt-get autoremove -y docker-ce && curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - && sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" && sudo apt-get update && sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs) && docker load -q -i mqadvanced-server-dev.tar" +jobs: + include: + - if: type IN (pull_request) + env: DOCKER_DOWNGRADE="docker save -o images.tar mqadvanced-server-dev mq-dev-jms-test && + sudo apt-get autoremove -y docker-ce && + curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - && + sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" && + sudo apt-get update && + sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs) && + docker load -q -i mqadvanced-server-dev.tar && + export DOCKER_API_VERSION=\"1.24\"" + - env: DOCKER_DOWNGRADE="echo nothing to be done" before_install: - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - diff --git a/test.out b/test.out new file mode 100644 index 0000000..e69de29