Repository: couchdb-ci Updated Branches: refs/heads/master a9a306e4d -> eef711030
use jenkins/build.sh when building locally Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/8365bd85 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/8365bd85 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/8365bd85 Branch: refs/heads/master Commit: 8365bd8594e03b73f66f756b810fd046da396295 Parents: a9a306e Author: Bastian Krol <[email protected]> Authored: Tue Feb 9 17:08:54 2016 +0100 Committer: Bastian Krol <[email protected]> Committed: Tue Feb 9 17:08:54 2016 +0100 ---------------------------------------------------------------------- bin/centos-7-erlang-18/run-build-in-container.sh | 6 +++++- bin/centos-7-erlang-default/run-build-in-container.sh | 6 +++++- bin/debian-8-erlang-18/run-build-in-container.sh | 6 +++++- bin/debian-8-erlang-default/run-build-in-container.sh | 6 +++++- bin/ubuntu-14.04-erlang-18/run-build-in-container.sh | 6 +++++- bin/ubuntu-14.04-erlang-default/run-build-in-container.sh | 6 +++++- jenkins/build.sh | 2 -- 7 files changed, 30 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8365bd85/bin/centos-7-erlang-18/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18/run-build-in-container.sh b/bin/centos-7-erlang-18/run-build-in-container.sh index cc91386..fe9aa90 100755 --- a/bin/centos-7-erlang-18/run-build-in-container.sh +++ b/bin/centos-7-erlang-18/run-build-in-container.sh @@ -17,4 +17,8 @@ # specific language governing permissions and limitations # under the License. -docker run -e LD_LIBRARY_PATH='/usr/local/lib' basti1302/couchdb-build-centos-7-erlang-18.2 +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=centos-7 ERLANG=18.2 jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8365bd85/bin/centos-7-erlang-default/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-default/run-build-in-container.sh b/bin/centos-7-erlang-default/run-build-in-container.sh index 04b3869..6ac2d2a 100755 --- a/bin/centos-7-erlang-default/run-build-in-container.sh +++ b/bin/centos-7-erlang-default/run-build-in-container.sh @@ -17,4 +17,8 @@ # specific language governing permissions and limitations # under the License. -docker run -e LD_LIBRARY_PATH='/usr/local/lib' basti1302/couchdb-build-centos-7-erlang-default +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=centos-7 ERLANG=default jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8365bd85/bin/debian-8-erlang-18/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18/run-build-in-container.sh b/bin/debian-8-erlang-18/run-build-in-container.sh index 1e1ef30..151e811 100755 --- a/bin/debian-8-erlang-18/run-build-in-container.sh +++ b/bin/debian-8-erlang-18/run-build-in-container.sh @@ -17,4 +17,8 @@ # specific language governing permissions and limitations # under the License. -docker run basti1302/couchdb-build-debian-8-erlang-18.2 +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=debian-8 ERLANG=18.2 jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8365bd85/bin/debian-8-erlang-default/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-default/run-build-in-container.sh b/bin/debian-8-erlang-default/run-build-in-container.sh index 94e5970..9d54270 100755 --- a/bin/debian-8-erlang-default/run-build-in-container.sh +++ b/bin/debian-8-erlang-default/run-build-in-container.sh @@ -17,4 +17,8 @@ # specific language governing permissions and limitations # under the License. -docker run basti1302/couchdb-build-debian-8-erlang-default +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=debian-8 ERLANG=default jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8365bd85/bin/ubuntu-14.04-erlang-18/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18/run-build-in-container.sh b/bin/ubuntu-14.04-erlang-18/run-build-in-container.sh index d174150..8fe0eec 100755 --- a/bin/ubuntu-14.04-erlang-18/run-build-in-container.sh +++ b/bin/ubuntu-14.04-erlang-18/run-build-in-container.sh @@ -17,4 +17,8 @@ # specific language governing permissions and limitations # under the License. -docker run basti1302/couchdb-build-ubuntu-14.04-erlang-18.2 +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=ubuntu-14.04 ERLANG=18.2 jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8365bd85/bin/ubuntu-14.04-erlang-default/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-default/run-build-in-container.sh b/bin/ubuntu-14.04-erlang-default/run-build-in-container.sh index c15e7e6..bd5c49b 100755 --- a/bin/ubuntu-14.04-erlang-default/run-build-in-container.sh +++ b/bin/ubuntu-14.04-erlang-default/run-build-in-container.sh @@ -17,4 +17,8 @@ # specific language governing permissions and limitations # under the License. -docker run basti1302/couchdb-build-ubuntu-14.04-erlang-default +set -e +pushd $( dirname "$0" )/../.. +pwd +OS=ubuntu-14.04 ERLANG=default jenkins/build.sh +popd http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8365bd85/jenkins/build.sh ---------------------------------------------------------------------- diff --git a/jenkins/build.sh b/jenkins/build.sh index 8a59371..555637d 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -34,8 +34,6 @@ set -xe COUCHDB_CI_DIRECTORY=$( cd "$( dirname "$0" )/.." && pwd ) cd "$COUCHDB_CI_DIRECTORY" -rm -f $DOCKERFILE # Just in case a stale one exists. - DOCKER_IMAGE="basti1302/couchdb-build-" DOCKER_OPTIONS=""
