From 1c8ce0e976c1b77f6f528e448fe410561cd7446b Mon Sep 17 00:00:00 2001 From: William Yeh Date: Thu, 9 Jul 2015 12:48:04 +0800 Subject: [PATCH] Update: simplify circle.yml to leverage CircleCI's upgrading to Docker 1.6.2 --- .travis.yml | 24 ++++++++++++------------ Vagrantfile | 12 ++++++------ circle.yml | 34 ++++++---------------------------- 3 files changed, 24 insertions(+), 46 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23b84ab..9cc3e37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,18 +12,18 @@ install: script: - echo "==> Building the main Docker images..." - - ./run 'docker build -f centos6/Dockerfile -t ansible centos6 && docker run -i ansible > result-centos6' - - ./run 'docker build -f centos7/Dockerfile -t ansible centos7 && docker run -i ansible > result-centos7' - - ./run 'docker build -f debian7/Dockerfile -t ansible debian7 && docker run -i ansible > result-debian7' - - ./run 'docker build -f debian8/Dockerfile -t ansible debian8 && docker run -i ansible > result-debian8' - - ./run 'docker build -f ubuntu12.04/Dockerfile -t ansible ubuntu12.04 && docker run -i ansible > result-ubuntu12.04' - - ./run 'docker build -f ubuntu14.04/Dockerfile -t ansible ubuntu14.04 && docker run -i ansible > result-ubuntu14.04' - - ./run 'docker build -f centos6-onbuild/Dockerfile -t ansible centos6-onbuild && docker run -i ansible > result-centos6-onbuild' - - ./run 'docker build -f centos7-onbuild/Dockerfile -t ansible centos7-onbuild && docker run -i ansible > result-centos7-onbuild' - - ./run 'docker build -f debian7-onbuild/Dockerfile -t ansible debian7-onbuild && docker run -i ansible > result-debian7-onbuild' - - ./run 'docker build -f debian8-onbuild/Dockerfile -t ansible debian8-onbuild && docker run -i ansible > result-debian8-onbuild' - - ./run 'docker build -f ubuntu12.04-onbuild/Dockerfile -t ansible ubuntu12.04-onbuild && docker run -i ansible > result-ubuntu12.04-onbuild' - - ./run 'docker build -f ubuntu14.04-onbuild/Dockerfile -t ansible ubuntu14.04-onbuild && docker run -i ansible > result-ubuntu14.04-onbuild' + - ./run 'docker build -t ansible centos6 && docker run -i ansible > result-centos6' + - ./run 'docker build -t ansible centos7 && docker run -i ansible > result-centos7' + - ./run 'docker build -t ansible debian7 && docker run -i ansible > result-debian7' + - ./run 'docker build -t ansible debian8 && docker run -i ansible > result-debian8' + - ./run 'docker build -t ansible ubuntu12.04 && docker run -i ansible > result-ubuntu12.04' + - ./run 'docker build -t ansible ubuntu14.04 && docker run -i ansible > result-ubuntu14.04' + - ./run 'docker build -t ansible centos6-onbuild && docker run -i ansible > result-centos6-onbuild' + - ./run 'docker build -t ansible centos7-onbuild && docker run -i ansible > result-centos7-onbuild' + - ./run 'docker build -t ansible debian7-onbuild && docker run -i ansible > result-debian7-onbuild' + - ./run 'docker build -t ansible debian8-onbuild && docker run -i ansible > result-debian8-onbuild' + - ./run 'docker build -t ansible ubuntu12.04-onbuild && docker run -i ansible > result-ubuntu12.04-onbuild' + - ./run 'docker build -t ansible ubuntu14.04-onbuild && docker run -i ansible > result-ubuntu14.04-onbuild' - echo "==> Validating the test results..." diff --git a/Vagrantfile b/Vagrantfile index 9e3514b..beac0fc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,12 +4,12 @@ Vagrant.configure(2) do |config| config.vm.provision "shell", inline: <<-SHELL cd /vagrant - docker build -t ansible:ubuntu14.04 ubuntu14.04 - docker build -t ansible:ubuntu12.04 ubuntu12.04 - docker build -t ansible:debian8 debian8 - docker build -t ansible:debian7 debian7 - docker build -t ansible:centos7 centos7 - docker build -t ansible:centos6 centos6 + docker build -t ansible:ubuntu14.04 ubuntu14.04 + docker build -t ansible:ubuntu12.04 ubuntu12.04 + docker build -t ansible:debian8 debian8 + docker build -t ansible:debian7 debian7 + docker build -t ansible:centos7 centos7 + docker build -t ansible:centos6 centos6 docker build -t ansible:ubuntu14.04-onbuild ubuntu14.04-onbuild docker build -t ansible:ubuntu12.04-onbuild ubuntu12.04-onbuild diff --git a/circle.yml b/circle.yml index 9ebe69d..6d69d2f 100644 --- a/circle.yml +++ b/circle.yml @@ -7,40 +7,18 @@ dependencies: - docker info - docker version - - cp ubuntu14.04/Dockerfile Dockerfile - - docker build -t ansible_trusty ubuntu14.04 + - docker build -t ansible_trusty ubuntu14.04 + - docker build -t ansible_precise ubuntu12.04 + - docker build -t ansible_jessie debian8 + - docker build -t ansible_wheezy debian7 + - docker build -t ansible_centos7 centos7 + - docker build -t ansible_centos6 centos6 - - cp ubuntu12.04/Dockerfile Dockerfile - - docker build -t ansible_precise ubuntu12.04 - - - cp debian8/Dockerfile Dockerfile - - docker build -t ansible_jessie debian8 - - - cp debian7/Dockerfile Dockerfile - - docker build -t ansible_wheezy debian7 - - - cp centos7/Dockerfile Dockerfile - - docker build -t ansible_centos7 centos7 - - - cp centos6/Dockerfile Dockerfile - - docker build -t ansible_centos6 centos6 - - - cp ubuntu14.04-onbuild/Dockerfile Dockerfile - docker build -t ansible_trusty_onbuild ubuntu14.04-onbuild - - - cp ubuntu12.04-onbuild/Dockerfile Dockerfile - docker build -t ansible_precise_onbuild ubuntu12.04-onbuild - - - cp debian8-onbuild/Dockerfile Dockerfile - docker build -t ansible_jessie_onbuild debian8-onbuild - - - cp debian7-onbuild/Dockerfile Dockerfile - docker build -t ansible_wheezy_onbuild debian7-onbuild - - - cp centos7-onbuild/Dockerfile Dockerfile - docker build -t ansible_centos7_onbuild centos7-onbuild - - - cp centos6-onbuild/Dockerfile Dockerfile - docker build -t ansible_centos6_onbuild centos6-onbuild test: -- 2.41.0