github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1212 from progrium/mh-dont-install-docker-in-ci

Browse Source 
let circleci dictate docker install (fixes master)
This commit is contained in:
Jose Diaz-Gonzalez
2015-05-27 18:03:29 -04:00
parent 2ceed0cbdf b35190101c
commit 0bfa25f73e
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -86,6 +86,7 @@ docker: aufs
apt-get install -qq -y curl apt-get install -qq -y curl
egrep -i "^docker" /etc/group || groupadd docker egrep -i "^docker" /etc/group || groupadd docker
usermod -aG docker dokku usermod -aG docker dokku
ifndef CI
curl -sSL https://get.docker.com/gpg | apt-key add - curl -sSL https://get.docker.com/gpg | apt-key add -
echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
apt-get update apt-get update
@@ -95,6 +96,7 @@ else
apt-get install -qq -y lxc-docker apt-get install -qq -y lxc-docker
endif endif
sleep 2 # give docker a moment i guess sleep 2 # give docker a moment i guess
endif
aufs: aufs:
ifndef CI ifndef CI

2
tests/ci/parallel_runner.sh
View File

@@ -3,7 +3,7 @@
MODE="$1"; MODE=${MODE:="testing"} MODE="$1"; MODE=${MODE:="testing"}
setup_circle() { setup_circle() {
MAKE_ENV="CI=true DOCKER_VERSION=1.5.0" MAKE_ENV="CI=true"
[[ "$1" == "buildstack" ]] && MAKE_ENV+=" BUILD_STACK=true " [[ "$1" == "buildstack" ]] && MAKE_ENV+=" BUILD_STACK=true "
echo "setting up with MAKE_ENV: $MAKE_ENV" echo "setting up with MAKE_ENV: $MAKE_ENV"
sudo -E CI=true make -e sshcommand sudo -E CI=true make -e sshcommand