You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by ba...@apache.org on 2016/01/30 11:27:01 UTC
[2/2] couchdb-ci git commit: add Debian 8
add Debian 8
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/78add682
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/78add682
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/78add682
Branch: refs/heads/master
Commit: 78add68293f42bf982689f62e216cfaea610ce8b
Parents: 7f6bcd8
Author: Bastian Krol <ba...@apache.org>
Authored: Fri Jan 29 21:39:19 2016 +0100
Committer: Bastian Krol <ba...@apache.org>
Committed: Sat Jan 30 11:24:43 2016 +0100
----------------------------------------------------------------------
ansible/docker-inventories/debian-8-erlang-18 | 20 +++++++
.../docker-inventories/debian-8-erlang-default | 20 +++++++
ansible/roles/debian-8/vars/main.yml | 2 +
.../roles/debian-based/tasks/dependencies.yml | 58 ++++++++++++++++++++
ansible/roles/debian-based/tasks/main.yml | 18 ++++++
ansible/roles/erlang-18/tasks/main.yml | 4 +-
.../roles/ubuntu-1404/tasks/dependencies.yml | 58 --------------------
ansible/roles/ubuntu-1404/tasks/main.yml | 18 ------
ansible/roles/ubuntu-1404/vars/main.yml | 2 +
ansible/site.yml | 24 +++++++-
bin/debian-8-erlang-18/create-container.sh | 28 ++++++++++
bin/debian-8-erlang-18/enter-container.sh | 20 +++++++
bin/debian-8-erlang-18/publish-container.sh | 20 +++++++
.../run-build-in-container.sh | 20 +++++++
bin/debian-8-erlang-default/create-container.sh | 28 ++++++++++
bin/debian-8-erlang-default/enter-container.sh | 20 +++++++
.../publish-container.sh | 20 +++++++
.../run-build-in-container.sh | 20 +++++++
docker/debian-8-erlang-18/Dockerfile | 37 +++++++++++++
docker/debian-8-erlang-default/Dockerfile | 37 +++++++++++++
docker/ubuntu-14.04-erlang-18/Dockerfile | 2 +-
docker/ubuntu-14.04-erlang-default/Dockerfile | 2 +-
jenkins/build.sh | 4 ++
23 files changed, 400 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/docker-inventories/debian-8-erlang-18
----------------------------------------------------------------------
diff --git a/ansible/docker-inventories/debian-8-erlang-18 b/ansible/docker-inventories/debian-8-erlang-18
new file mode 100644
index 0000000..08de46e
--- /dev/null
+++ b/ansible/docker-inventories/debian-8-erlang-18
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[debian-8-erlang-18]
+localhost
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/docker-inventories/debian-8-erlang-default
----------------------------------------------------------------------
diff --git a/ansible/docker-inventories/debian-8-erlang-default b/ansible/docker-inventories/debian-8-erlang-default
new file mode 100644
index 0000000..271a50c
--- /dev/null
+++ b/ansible/docker-inventories/debian-8-erlang-default
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+[debian-8-erlang-default]
+localhost
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/roles/debian-8/vars/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/debian-8/vars/main.yml b/ansible/roles/debian-8/vars/main.yml
new file mode 100644
index 0000000..208d665
--- /dev/null
+++ b/ansible/roles/debian-8/vars/main.yml
@@ -0,0 +1,2 @@
+erlang_solutions_key_url: http://packages.erlang-solutions.com/debian/erlang_solutions.asc
+erlang_solutions_apt_repo_url: deb http://packages.erlang-solutions.com/debian jessie contrib
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/roles/debian-based/tasks/dependencies.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/debian-based/tasks/dependencies.yml b/ansible/roles/debian-based/tasks/dependencies.yml
new file mode 100644
index 0000000..1aa1ade
--- /dev/null
+++ b/ansible/roles/debian-based/tasks/dependencies.yml
@@ -0,0 +1,58 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# apt-get update
+- name: update apt cache
+ apt:
+ update_cache: yes
+
+- name: install auxiliary packages
+ apt: name={{item}} state=present
+ with_items:
+ - apt-transport-https
+ - curl
+ - git
+ - pkg-config
+ - python
+
+# dependencies for make couch, except erlang
+- name: install packages required to build CouchDB
+ apt: name={{item}} state=present install_recommends=no
+ with_items:
+ - build-essential
+ - ca-certificates
+ - libcurl4-openssl-dev
+ - libicu-dev
+ - libmozjs185-dev
+
+# required for make check and make dialyze
+- name: install packages required to build CouchDB
+ apt: name={{item}} state=present install_recommends=no
+ with_items:
+ - shunit2
+
+# required for make docs
+- name: install packages required to build CouchDB
+ apt: name={{item}} state=present install_recommends=no
+ with_items:
+ - help2man
+ - python-sphinx
+ - texlive-latex-base
+ - texlive-latex-recommended
+ - texlive-latex-extra
+ - texlive-fonts-recommended
+ - texinfo
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/roles/debian-based/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/debian-based/tasks/main.yml b/ansible/roles/debian-based/tasks/main.yml
new file mode 100644
index 0000000..bd28a4b
--- /dev/null
+++ b/ansible/roles/debian-based/tasks/main.yml
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+- include: dependencies.yml
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/roles/erlang-18/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/erlang-18/tasks/main.yml b/ansible/roles/erlang-18/tasks/main.yml
index 354256a..0deb39a 100644
--- a/ansible/roles/erlang-18/tasks/main.yml
+++ b/ansible/roles/erlang-18/tasks/main.yml
@@ -17,13 +17,13 @@
- name: import the Erlang Solutions key into apt
apt_key:
- url: http://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc
+ url: "{{ erlang_solutions_key_url }}"
state: present
# validate_certs: no
- name: add Erlang Solutions deb repository
apt_repository:
- repo: 'deb http://packages.erlang-solutions.com/ubuntu trusty contrib'
+ repo: "{{ erlang_solutions_apt_repo_url }}"
state: present
# apt-get update
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/roles/ubuntu-1404/tasks/dependencies.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu-1404/tasks/dependencies.yml b/ansible/roles/ubuntu-1404/tasks/dependencies.yml
deleted file mode 100644
index 1aa1ade..0000000
--- a/ansible/roles/ubuntu-1404/tasks/dependencies.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# apt-get update
-- name: update apt cache
- apt:
- update_cache: yes
-
-- name: install auxiliary packages
- apt: name={{item}} state=present
- with_items:
- - apt-transport-https
- - curl
- - git
- - pkg-config
- - python
-
-# dependencies for make couch, except erlang
-- name: install packages required to build CouchDB
- apt: name={{item}} state=present install_recommends=no
- with_items:
- - build-essential
- - ca-certificates
- - libcurl4-openssl-dev
- - libicu-dev
- - libmozjs185-dev
-
-# required for make check and make dialyze
-- name: install packages required to build CouchDB
- apt: name={{item}} state=present install_recommends=no
- with_items:
- - shunit2
-
-# required for make docs
-- name: install packages required to build CouchDB
- apt: name={{item}} state=present install_recommends=no
- with_items:
- - help2man
- - python-sphinx
- - texlive-latex-base
- - texlive-latex-recommended
- - texlive-latex-extra
- - texlive-fonts-recommended
- - texinfo
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/roles/ubuntu-1404/tasks/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu-1404/tasks/main.yml b/ansible/roles/ubuntu-1404/tasks/main.yml
deleted file mode 100644
index bd28a4b..0000000
--- a/ansible/roles/ubuntu-1404/tasks/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-- include: dependencies.yml
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/roles/ubuntu-1404/vars/main.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/ubuntu-1404/vars/main.yml b/ansible/roles/ubuntu-1404/vars/main.yml
new file mode 100644
index 0000000..1d643be
--- /dev/null
+++ b/ansible/roles/ubuntu-1404/vars/main.yml
@@ -0,0 +1,2 @@
+erlang_solutions_key_url: http://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc
+erlang_solutions_apt_repo_url: deb http://packages.erlang-solutions.com/ubuntu trusty contrib
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/ansible/site.yml
----------------------------------------------------------------------
diff --git a/ansible/site.yml b/ansible/site.yml
index 880738f..785a1da 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -18,15 +18,35 @@
- hosts: ubuntu-14.04-erlang-18
remote_user: root
roles:
- - nodesource.node
- ubuntu-1404
+ - nodesource.node
+ - debian-based
- erlang-18
- common
- hosts: ubuntu-14.04-erlang-default
remote_user: root
roles:
- - nodesource.node
- ubuntu-1404
+ - nodesource.node
+ - debian-based
+ - erlang-default
+ - common
+
+- hosts: debian-8-erlang-18
+ remote_user: root
+ roles:
+ - debian-8
+ - nodesource.node
+ - debian-based
+ - erlang-18
+ - common
+
+- hosts: debian-8-erlang-default
+ remote_user: root
+ roles:
+ - debian-8
+ - nodesource.node
+ - debian-based
- erlang-default
- common
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/bin/debian-8-erlang-18/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-erlang-18/create-container.sh b/bin/debian-8-erlang-18/create-container.sh
new file mode 100755
index 0000000..4745d12
--- /dev/null
+++ b/bin/debian-8-erlang-18/create-container.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+# The Docker containers need the root directory of this repository as their
+# build context (because they need the Ansible files).
+pushd `dirname $0`/../.. > /dev/null
+
+docker build -f docker/debian-8-erlang-18/Dockerfile -t basti1302/couchdb-build-debian-8-erlang-18.2 .
+
+popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/bin/debian-8-erlang-18/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-erlang-18/enter-container.sh b/bin/debian-8-erlang-18/enter-container.sh
new file mode 100755
index 0000000..1771075
--- /dev/null
+++ b/bin/debian-8-erlang-18/enter-container.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+docker run -it basti1302/couchdb-build-debian-8-erlang-18.2 bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/bin/debian-8-erlang-18/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-erlang-18/publish-container.sh b/bin/debian-8-erlang-18/publish-container.sh
new file mode 100755
index 0000000..15e3142
--- /dev/null
+++ b/bin/debian-8-erlang-18/publish-container.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+docker push basti1302/couchdb-build-debian-8-erlang-18.2
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/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
new file mode 100755
index 0000000..1e1ef30
--- /dev/null
+++ b/bin/debian-8-erlang-18/run-build-in-container.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+docker run basti1302/couchdb-build-debian-8-erlang-18.2
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/bin/debian-8-erlang-default/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-erlang-default/create-container.sh b/bin/debian-8-erlang-default/create-container.sh
new file mode 100755
index 0000000..ae506d9
--- /dev/null
+++ b/bin/debian-8-erlang-default/create-container.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -e
+
+# The Docker containers need the root directory of this repository as their
+# build context (because they need the Ansible files).
+pushd `dirname $0`/../.. > /dev/null
+
+docker build -f docker/debian-8-erlang-default/Dockerfile -t basti1302/couchdb-build-debian-8-erlang-default .
+
+popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/bin/debian-8-erlang-default/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-erlang-default/enter-container.sh b/bin/debian-8-erlang-default/enter-container.sh
new file mode 100755
index 0000000..799e9c1
--- /dev/null
+++ b/bin/debian-8-erlang-default/enter-container.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+docker run -it basti1302/couchdb-build-debian-8-erlang-default bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/bin/debian-8-erlang-default/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-erlang-default/publish-container.sh b/bin/debian-8-erlang-default/publish-container.sh
new file mode 100755
index 0000000..817c8e1
--- /dev/null
+++ b/bin/debian-8-erlang-default/publish-container.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+docker push basti1302/couchdb-build-debian-8-erlang-default
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/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
new file mode 100755
index 0000000..94e5970
--- /dev/null
+++ b/bin/debian-8-erlang-default/run-build-in-container.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+docker run basti1302/couchdb-build-debian-8-erlang-default
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/docker/debian-8-erlang-18/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/debian-8-erlang-18/Dockerfile b/docker/debian-8-erlang-18/Dockerfile
new file mode 100644
index 0000000..6e4775b
--- /dev/null
+++ b/docker/debian-8-erlang-18/Dockerfile
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+
+# NOTE: All docker files need to be run from ../../, that is
+# docker build -f /docker/<container>/Dockerfile
+
+# Base Image: Plain Vanilla Debian with Ansible installed
+FROM williamyeh/ansible:master-debian8-onbuild
+
+# Add ansible directory and cd to it
+ADD ./ansible /ansible
+WORKDIR /ansible
+
+# Install Node.js role
+RUN ansible-galaxy install nodesource.node
+
+# Run Ansible to provision container
+RUN ansible-playbook site.yml \
+ --connection=local \
+ --inventory-file=./docker-inventories/debian-8-erlang-18
+
+USER couchdb
+
+CMD ["/home/couchdb/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/docker/debian-8-erlang-default/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/debian-8-erlang-default/Dockerfile b/docker/debian-8-erlang-default/Dockerfile
new file mode 100644
index 0000000..bcdb3c6
--- /dev/null
+++ b/docker/debian-8-erlang-default/Dockerfile
@@ -0,0 +1,37 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+
+# NOTE: All docker files need to be run from ../../, that is
+# docker build -f /docker/<container>/Dockerfile
+
+# Base Image: Plain Vanilla Debian with Ansible installed
+FROM williamyeh/ansible:master-debian8-onbuild
+
+# Add ansible directory and cd to it
+ADD ./ansible /ansible
+WORKDIR /ansible
+
+# Install Node.js role
+RUN ansible-galaxy install nodesource.node
+
+# Run Ansible to provision container
+RUN ansible-playbook site.yml \
+ --connection=local \
+ --inventory-file=./docker-inventories/debian-8-erlang-default
+
+USER couchdb
+
+CMD ["/home/couchdb/build-ci.sh"]
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/docker/ubuntu-14.04-erlang-18/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/ubuntu-14.04-erlang-18/Dockerfile b/docker/ubuntu-14.04-erlang-18/Dockerfile
index c850390..f53b0bf 100644
--- a/docker/ubuntu-14.04-erlang-18/Dockerfile
+++ b/docker/ubuntu-14.04-erlang-18/Dockerfile
@@ -18,7 +18,7 @@
# docker build -f /docker/<container>/Dockerfile
# Base Image: Plain Vanilla Ubuntu 14.04 with Ansible installed
-FROM williamyeh/ansible:ubuntu14.04
+FROM williamyeh/ansible:ubuntu14.04-onbuild
# Add ansible directory and cd to it
ADD ./ansible /ansible
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/docker/ubuntu-14.04-erlang-default/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/ubuntu-14.04-erlang-default/Dockerfile b/docker/ubuntu-14.04-erlang-default/Dockerfile
index 4acfd3d..52db492 100644
--- a/docker/ubuntu-14.04-erlang-default/Dockerfile
+++ b/docker/ubuntu-14.04-erlang-default/Dockerfile
@@ -18,7 +18,7 @@
# docker build -f /docker/<container>/Dockerfile
# Base Image: Plain Vanilla Ubuntu 14.04 with Ansible installed
-FROM williamyeh/ansible:ubuntu14.04
+FROM williamyeh/ansible:ubuntu14.04-onbuild
# Add ansible directory and cd to it
ADD ./ansible /ansible
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/78add682/jenkins/build.sh
----------------------------------------------------------------------
diff --git a/jenkins/build.sh b/jenkins/build.sh
index ed60b1d..4c515a3 100755
--- a/jenkins/build.sh
+++ b/jenkins/build.sh
@@ -43,6 +43,10 @@ case $OS in
echo "Using Ubuntu 14.04"
DOCKER_IMAGE=$DOCKER_IMAGE"ubuntu-14.04-"
;;
+ debian-8*)
+ echo "Using Debian 8"
+ DOCKER_IMAGE=$DOCKER_IMAGE"debian-8-"
+ ;;
*)
echo "Unknown OS $OS"
exit 1