From 9d81dda524b859f02073fb2e85c287447335b196 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Sat, 3 Jan 2015 10:55:40 -0800 Subject: [PATCH 1/4] try circle again --- circle.yml | 32 +++++++++++++++++++++++++++++++ plugins/apps/pre-delete | 2 +- plugins/nginx-vhosts/dependencies | 3 ++- tests/test_deploy | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 000000000..7548e592e --- /dev/null +++ b/circle.yml @@ -0,0 +1,32 @@ +machine: + services: + - docker +dependencies: + cache_directories: + - "~/docker" + override: + - make -e ci-dependencies + - sudo -E CI=true make -e sshcommand pluginhook + # - sudo apt-get install -f + # - sudo apt-get autoremove + - sudo usermod -G docker dokku + - sudo -E CI=true make -e stack: { timeout: 300 } + - sudo -E CI=true make -e copyfiles plugin-dependencies version + - sudo dokku plugins-install +test: + pre: + #### circle does some weird *expletive* with regards to root and gh auth (needed for gitsubmodules test) + - sudo rsync -a ~ubuntu/.ssh/ ~root/.ssh/ + - sudo chown -R root:root ~root/.ssh/ + - sudo sed -e 's:/home/ubuntu:/root:g' ~root/.ssh/config + #### + - sudo -E make -e setup-deploy-tests + override: + - sudo -E make -e lint + - sudo -E make -e unit-tests + ### deploy tests (against buildstep release) #### + - sudo -E make -e deploy-tests: { timeout: 1800 } + ### deploy tests (against buildstep master) #### + - sudo docker rmi -f progrium/buildstep + - sudo -E BUILD_STACK=true make -e stack: { timeout: 1800 } + - sudo -E make -e deploy-tests: { timeout: 1800 } diff --git a/plugins/apps/pre-delete b/plugins/apps/pre-delete index 424213c37..55ca79e73 100755 --- a/plugins/apps/pre-delete +++ b/plugins/apps/pre-delete @@ -3,5 +3,5 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x APP="$1"; IMAGE="dokku/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache" if [[ -d $CACHE_DIR ]]; then - docker run --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; + docker run --rm -v "$CACHE_DIR:/cache" "$IMAGE" find /cache -depth -mindepth 1 -maxdepth 1 -exec rm -Rf {} \; || true fi diff --git a/plugins/nginx-vhosts/dependencies b/plugins/nginx-vhosts/dependencies index dbb5a7325..db5a54b6a 100755 --- a/plugins/nginx-vhosts/dependencies +++ b/plugins/nginx-vhosts/dependencies @@ -3,7 +3,8 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x case "$DOKKU_DISTRO" in ubuntu) - apt-get install -qq -y software-properties-common python-software-properties + [[ -z "$CIRCLECI" ]] && apt-get install -qq -y software-properties-common python-software-properties + [[ -n "$CIRCLECI" ]] && aptitude install -q -y software-properties-common python-software-properties add-apt-repository -y ppa:nginx/stable apt-get update apt-get install -qq -y nginx dnsutils diff --git a/tests/test_deploy b/tests/test_deploy index 271d30e7c..5ec2d6eb7 100755 --- a/tests/test_deploy +++ b/tests/test_deploy @@ -1,5 +1,5 @@ #!/usr/bin/env bash -set -eo pipefail +set -xeo pipefail SELF=$(which $0); APP="$1"; TARGET="$2"; FORWARDED_PORT="$3" REMOTE="dokku@$TARGET" From 881a700e99d14bb6a1ab1235efafc661140a7d73 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 5 Jan 2015 16:44:39 -0800 Subject: [PATCH 2/4] attempt to use make install --- circle.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/circle.yml b/circle.yml index 7548e592e..fee4fc68a 100644 --- a/circle.yml +++ b/circle.yml @@ -5,22 +5,18 @@ dependencies: cache_directories: - "~/docker" override: - - make -e ci-dependencies - - sudo -E CI=true make -e sshcommand pluginhook - # - sudo apt-get install -f - # - sudo apt-get autoremove + # need to add the dokku user to the docker group + - sudo -E CI=true make -e sshcommand - sudo usermod -G docker dokku - - sudo -E CI=true make -e stack: { timeout: 300 } - - sudo -E CI=true make -e copyfiles plugin-dependencies version - - sudo dokku plugins-install -test: - pre: + - sudo -E CI=true DOCKER_VERSION=1.4.1 make -e install: { timeout: 300 } + - make -e ci-dependencies #### circle does some weird *expletive* with regards to root and gh auth (needed for gitsubmodules test) - sudo rsync -a ~ubuntu/.ssh/ ~root/.ssh/ - sudo chown -R root:root ~root/.ssh/ - sudo sed -e 's:/home/ubuntu:/root:g' ~root/.ssh/config #### - sudo -E make -e setup-deploy-tests +test: override: - sudo -E make -e lint - sudo -E make -e unit-tests @@ -28,5 +24,5 @@ test: - sudo -E make -e deploy-tests: { timeout: 1800 } ### deploy tests (against buildstep master) #### - sudo docker rmi -f progrium/buildstep - - sudo -E BUILD_STACK=true make -e stack: { timeout: 1800 } + - sudo -E BUILD_STACK=true make -e stack - sudo -E make -e deploy-tests: { timeout: 1800 } From 471a5fa087d56b842e7f6c8cc4cb6506c76c9086 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 6 Jan 2015 18:38:28 -0800 Subject: [PATCH 3/4] badge readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e8eafe97..3a15e1af1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Dokku [![Build Status](https://app.wercker.com/status/029900380b7e5f31bbf4392725067769/s/master "Build Status")](https://app.wercker.com/project/bykey/029900380b7e5f31bbf4392725067769) +# Dokku [![Build Status](https://circleci.com/gh/progrium/dokku/tree/master.svg?style=svg&circle-token=eec5b442dda53a4d229911dd97d4214853acc262 "Build Status")](https://circleci.com/gh/progrium/dokku/tree/master) Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. Sponsored by our friends at [Deis](http://deis.io/). From 43e9e6ddb6681debb4f1a98b5413e3f270d2fdfc Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 6 Jan 2015 18:46:29 -0800 Subject: [PATCH 4/4] disable wercker --- wercker.yml | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 wercker.yml diff --git a/wercker.yml b/wercker.yml deleted file mode 100644 index cccda3492..000000000 --- a/wercker.yml +++ /dev/null @@ -1,39 +0,0 @@ -box: wercker-labs/docker -no-response-timeout: 20 -build: - steps: - - script: - name: install os requirements - code: |- - sudo apt-get update - sudo apt-get install -y make software-properties-common git wget man-db - - script: - name: ci dependencies - code: make -e ci-dependencies - - script: - name: install dokku - code: sudo -E CI=true DOCKER_VERSION=1.4.0 make -e install - - script: - name: setup deploy tests - code: sudo -E make -e setup-deploy-tests - - script: - name: lint - code: sudo -E make -e lint - - script: - name: unit tests - code: sudo -E make -e unit-tests - - script: - name: deploy tests (against buildstep release) - code: sudo -E make -e deploy-tests - - script: - name: deploy tests (against buildstep master) - code: |- - sudo docker rmi -f progrium/buildstep - sudo -E BUILD_STACK=true make -e stack - sudo -E make -e deploy-tests - after-steps: - - wouter/irc-notify: - server: irc.freenode.net - port: 6667 - nickname: dokku-wercker - channel: dokku