You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@couchdb.apache.org by wo...@apache.org on 2017/03/16 21:45:12 UTC
[1/3] couchdb-ci git commit: Fix CentOS LaTeX build
Repository: couchdb-ci
Updated Branches:
refs/heads/master 30055eb24 -> 7fa91caea
Fix CentOS LaTeX build
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/3df0edf8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/3df0edf8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/3df0edf8
Branch: refs/heads/master
Commit: 3df0edf8dc41185df0ca1f5471e128020f23b504
Parents: 30055eb
Author: Joan Touzet <wo...@apache.org>
Authored: Thu Mar 16 13:36:06 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Thu Mar 16 13:36:06 2017 -0700
----------------------------------------------------------------------
.../roles/dependencies-centos/tasks/latex.yml | 23 ++++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/3df0edf8/ansible/roles/dependencies-centos/tasks/latex.yml
----------------------------------------------------------------------
diff --git a/ansible/roles/dependencies-centos/tasks/latex.yml b/ansible/roles/dependencies-centos/tasks/latex.yml
index ca0ba59..b2a01b4 100644
--- a/ansible/roles/dependencies-centos/tasks/latex.yml
+++ b/ansible/roles/dependencies-centos/tasks/latex.yml
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-- name: copy TeX Live installer
- copy:
- src: install-tl-unx.tar.gz
+- name: download TeX Live installer
+ get_url:
+ url: http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz
dest: /tmp/install-tl-unx.tar.gz
- name: copy TeX Live installer profile
copy:
@@ -28,16 +28,25 @@
src: /tmp/install-tl-unx.tar.gz
dest: /tmp
copy: no
+- name: remove TeX Live installer
+ file:
+ path: /tmp/install-tl-unx.tar.gz
+ state: absent
+- name: determine extracted installer path
+ shell: ls -d /tmp/install-tl-*
+ register: dir_name
- name: install TeX Live via net installer
- command: /tmp/install-tl-20160206/install-tl --profile=/tmp/texlive.profile
- args:
- chdir: /tmp/install-tl-20160206
+ command: "{{ item }}/install-tl --profile=/tmp/texlive.profile chdir={{ item }}"
+ with_items: "{{ dir_name.stdout_lines }}"
- name: install additional TeX packages
command: tlmgr install capt-of framed multirow needspace threeparttable titlesec upquote wrapfig
# remove docs dir - this has no benefit for our use case and makes the
# container 500 MB bigger
+- name: find LaTeX docs dir
+ shell: ls -d /usr/local/texlive/*
+ register: docdir_name
- name: delete LaTeX docs
file:
- path: /usr/local/texlive/2015/texmf-dist/doc
+ path: "{{docdir_name}}/texmf-dist/doc"
state: absent
[3/3] couchdb-ci git commit: Add docker cleanup script
Posted by wo...@apache.org.
Add docker cleanup script
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/7fa91cae
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/7fa91cae
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/7fa91cae
Branch: refs/heads/master
Commit: 7fa91caead0481b5a2dc916f52a1ff0c7a0c7309
Parents: 51f2988
Author: Joan Touzet <wo...@apache.org>
Authored: Thu Mar 16 14:44:55 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Thu Mar 16 14:44:55 2017 -0700
----------------------------------------------------------------------
bin/cleanup-docker.sh | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/7fa91cae/bin/cleanup-docker.sh
----------------------------------------------------------------------
diff --git a/bin/cleanup-docker.sh b/bin/cleanup-docker.sh
new file mode 100755
index 0000000..dc114ac
--- /dev/null
+++ b/bin/cleanup-docker.sh
@@ -0,0 +1,32 @@
+#!/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.
+
+echo WARNING! This script will delete all stopped containers!
+read -n1 -r -p "Press any key to continue..." key
+echo
+
+# Delete all stopped containers
+docker rm $(docker ps -aq --filter status=exited) 2&>/dev/null
+
+# Delete all untagged or dangling images
+docker rmi $(docker images -q -f dangling=true) 2&>/dev/null
+
+# Clean up dangling volumes, if any
+docker volume rm $(docker volume ls -qf dangling=true) 2&>/dev/null
+
[2/3] couchdb-ci git commit: Shorten Docker image names now that we
have couchdbdev org
Posted by wo...@apache.org.
Shorten Docker image names now that we have couchdbdev org
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/51f2988d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/51f2988d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/51f2988d
Branch: refs/heads/master
Commit: 51f2988d334f2ff7f1f37935117468c9fcb5491f
Parents: 3df0edf
Author: Joan Touzet <wo...@apache.org>
Authored: Thu Mar 16 14:10:30 2017 -0700
Committer: Joan Touzet <wo...@apache.org>
Committed: Thu Mar 16 14:10:30 2017 -0700
----------------------------------------------------------------------
bin/centos-7-base/create-container.sh | 2 +-
bin/centos-7-base/enter-container.sh | 2 +-
bin/centos-7-base/publish-container.sh | 2 +-
bin/centos-7-erlang-18/create-container.sh | 2 +-
bin/centos-7-erlang-18/enter-container.sh | 2 +-
bin/centos-7-erlang-18/publish-container.sh | 2 +-
bin/centos-7-erlang-default/create-container.sh | 2 +-
bin/centos-7-erlang-default/enter-container.sh | 2 +-
bin/centos-7-erlang-default/publish-container.sh | 2 +-
bin/debian-8-base/create-container.sh | 2 +-
bin/debian-8-base/enter-container.sh | 2 +-
bin/debian-8-base/publish-container.sh | 2 +-
bin/debian-8-erlang-18/create-container.sh | 2 +-
bin/debian-8-erlang-18/enter-container.sh | 2 +-
bin/debian-8-erlang-18/publish-container.sh | 2 +-
bin/debian-8-erlang-default/create-container.sh | 2 +-
bin/debian-8-erlang-default/enter-container.sh | 2 +-
bin/debian-8-erlang-default/publish-container.sh | 2 +-
bin/ubuntu-14.04-base/create-container.sh | 2 +-
bin/ubuntu-14.04-base/enter-container.sh | 2 +-
bin/ubuntu-14.04-base/publish-container.sh | 2 +-
bin/ubuntu-14.04-erlang-18/create-container.sh | 2 +-
bin/ubuntu-14.04-erlang-18/enter-container.sh | 2 +-
bin/ubuntu-14.04-erlang-18/publish-container.sh | 2 +-
bin/ubuntu-14.04-erlang-default/create-container.sh | 2 +-
bin/ubuntu-14.04-erlang-default/enter-container.sh | 2 +-
bin/ubuntu-14.04-erlang-default/publish-container.sh | 2 +-
dockerfiles/centos-7-erlang-18 | 2 +-
dockerfiles/centos-7-erlang-default | 2 +-
dockerfiles/debian-8-erlang-18 | 2 +-
dockerfiles/debian-8-erlang-default | 2 +-
dockerfiles/ubuntu-14.04-erlang-18 | 2 +-
dockerfiles/ubuntu-14.04-erlang-default | 2 +-
jenkins/build.sh | 2 +-
34 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-base/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-base/create-container.sh b/bin/centos-7-base/create-container.sh
index c31a01a..9c5f068 100755
--- a/bin/centos-7-base/create-container.sh
+++ b/bin/centos-7-base/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/centos-7-base -t couchdbdev/couchdb-build-centos-7-base .
+docker build -f dockerfiles/centos-7-base -t couchdbdev/centos-7-base .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-base/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-base/enter-container.sh b/bin/centos-7-base/enter-container.sh
index e7c88ae..253b54b 100755
--- a/bin/centos-7-base/enter-container.sh
+++ b/bin/centos-7-base/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-centos-7-base bash
+docker run -it couchdbdev/centos-7-base bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-base/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-base/publish-container.sh b/bin/centos-7-base/publish-container.sh
index 86869ae..874c3d8 100755
--- a/bin/centos-7-base/publish-container.sh
+++ b/bin/centos-7-base/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-centos-7-base
+docker push couchdbdev/centos-7-base
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-erlang-18/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-erlang-18/create-container.sh b/bin/centos-7-erlang-18/create-container.sh
index 3ef2548..7f20ac9 100755
--- a/bin/centos-7-erlang-18/create-container.sh
+++ b/bin/centos-7-erlang-18/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/centos-7-erlang-18 -t couchdbdev/couchdb-build-centos-7-erlang-18.2 .
+docker build -f dockerfiles/centos-7-erlang-18 -t couchdbdev/centos-7-erlang-18.2 .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-erlang-18/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-erlang-18/enter-container.sh b/bin/centos-7-erlang-18/enter-container.sh
index 4fc26ca..a6ac0c1 100755
--- a/bin/centos-7-erlang-18/enter-container.sh
+++ b/bin/centos-7-erlang-18/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-centos-7-erlang-18.2 bash
+docker run -it couchdbdev/centos-7-erlang-18.2 bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-erlang-18/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-erlang-18/publish-container.sh b/bin/centos-7-erlang-18/publish-container.sh
index 31eda19..c1336a9 100755
--- a/bin/centos-7-erlang-18/publish-container.sh
+++ b/bin/centos-7-erlang-18/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-centos-7-erlang-18.2
+docker push couchdbdev/centos-7-erlang-18.2
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-erlang-default/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-erlang-default/create-container.sh b/bin/centos-7-erlang-default/create-container.sh
index fecfd68..8b8c118 100755
--- a/bin/centos-7-erlang-default/create-container.sh
+++ b/bin/centos-7-erlang-default/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/centos-7-erlang-default -t couchdbdev/couchdb-build-centos-7-erlang-default .
+docker build -f dockerfiles/centos-7-erlang-default -t couchdbdev/centos-7-erlang-default .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-erlang-default/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-erlang-default/enter-container.sh b/bin/centos-7-erlang-default/enter-container.sh
index 62b49ac..58342d1 100755
--- a/bin/centos-7-erlang-default/enter-container.sh
+++ b/bin/centos-7-erlang-default/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-centos-7-erlang-default bash
+docker run -it couchdbdev/centos-7-erlang-default bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/centos-7-erlang-default/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/centos-7-erlang-default/publish-container.sh b/bin/centos-7-erlang-default/publish-container.sh
index adee2b5..49f6592 100755
--- a/bin/centos-7-erlang-default/publish-container.sh
+++ b/bin/centos-7-erlang-default/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-centos-7-erlang-default
+docker push couchdbdev/centos-7-erlang-default
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/debian-8-base/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-base/create-container.sh b/bin/debian-8-base/create-container.sh
index 13d230c..6a7a0ce 100755
--- a/bin/debian-8-base/create-container.sh
+++ b/bin/debian-8-base/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/debian-8-base -t couchdbdev/couchdb-build-debian-8-base .
+docker build -f dockerfiles/debian-8-base -t couchdbdev/debian-8-base .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/debian-8-base/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-base/enter-container.sh b/bin/debian-8-base/enter-container.sh
index eac072e..b5442f5 100755
--- a/bin/debian-8-base/enter-container.sh
+++ b/bin/debian-8-base/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-debian-8-base bash
+docker run -it couchdbdev/debian-8-base bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/debian-8-base/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/debian-8-base/publish-container.sh b/bin/debian-8-base/publish-container.sh
index b2571b8..b3188de 100755
--- a/bin/debian-8-base/publish-container.sh
+++ b/bin/debian-8-base/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-debian-8-base
+docker push couchdbdev/debian-8-base
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/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
index 49304a2..d004b93 100755
--- a/bin/debian-8-erlang-18/create-container.sh
+++ b/bin/debian-8-erlang-18/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/debian-8-erlang-18 -t couchdbdev/couchdb-build-debian-8-erlang-18.2 .
+docker build -f dockerfiles/debian-8-erlang-18 -t couchdbdev/debian-8-erlang-18.2 .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/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
index 9f0d300..f5b9a1a 100755
--- a/bin/debian-8-erlang-18/enter-container.sh
+++ b/bin/debian-8-erlang-18/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-debian-8-erlang-18.2 bash
+docker run -it couchdbdev/debian-8-erlang-18.2 bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/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
index 4f79dba..fffc6c0 100755
--- a/bin/debian-8-erlang-18/publish-container.sh
+++ b/bin/debian-8-erlang-18/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-debian-8-erlang-18.2
+docker push couchdbdev/debian-8-erlang-18.2
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/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
index 307cd05..ef8c268 100755
--- a/bin/debian-8-erlang-default/create-container.sh
+++ b/bin/debian-8-erlang-default/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/debian-8-erlang-default -t couchdbdev/couchdb-build-debian-8-erlang-default .
+docker build -f dockerfiles/debian-8-erlang-default -t couchdbdev/debian-8-erlang-default .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/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
index 1152195..a974227 100755
--- a/bin/debian-8-erlang-default/enter-container.sh
+++ b/bin/debian-8-erlang-default/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-debian-8-erlang-default bash
+docker run -it couchdbdev/debian-8-erlang-default bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/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
index 9ca9144..7e685b9 100755
--- a/bin/debian-8-erlang-default/publish-container.sh
+++ b/bin/debian-8-erlang-default/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-debian-8-erlang-default
+docker push couchdbdev/debian-8-erlang-default
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-base/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-base/create-container.sh b/bin/ubuntu-14.04-base/create-container.sh
index a7b26be..b40b3c2 100755
--- a/bin/ubuntu-14.04-base/create-container.sh
+++ b/bin/ubuntu-14.04-base/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/ubuntu-14.04-base -t couchdbdev/couchdb-build-ubuntu-14.04-base .
+docker build -f dockerfiles/ubuntu-14.04-base -t couchdbdev/ubuntu-14.04-base .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-base/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-base/enter-container.sh b/bin/ubuntu-14.04-base/enter-container.sh
index 4c57c2a..74b2388 100755
--- a/bin/ubuntu-14.04-base/enter-container.sh
+++ b/bin/ubuntu-14.04-base/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-ubuntu-14.04-base bash
+docker run -it couchdbdev/ubuntu-14.04-base bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-base/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-base/publish-container.sh b/bin/ubuntu-14.04-base/publish-container.sh
index e011ab7..ab65b15 100755
--- a/bin/ubuntu-14.04-base/publish-container.sh
+++ b/bin/ubuntu-14.04-base/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-ubuntu-14.04-base
+docker push couchdbdev/ubuntu-14.04-base
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-erlang-18/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-erlang-18/create-container.sh b/bin/ubuntu-14.04-erlang-18/create-container.sh
index d16f521..02a8c35 100755
--- a/bin/ubuntu-14.04-erlang-18/create-container.sh
+++ b/bin/ubuntu-14.04-erlang-18/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/ubuntu-14.04-erlang-18 -t couchdbdev/couchdb-build-ubuntu-14.04-erlang-18.2 .
+docker build -f dockerfiles/ubuntu-14.04-erlang-18 -t couchdbdev/ubuntu-14.04-erlang-18.2 .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-erlang-18/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-erlang-18/enter-container.sh b/bin/ubuntu-14.04-erlang-18/enter-container.sh
index 74bafdb..a755d9e 100755
--- a/bin/ubuntu-14.04-erlang-18/enter-container.sh
+++ b/bin/ubuntu-14.04-erlang-18/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-ubuntu-14.04-erlang-18.2 bash
+docker run -it couchdbdev/ubuntu-14.04-erlang-18.2 bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-erlang-18/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-erlang-18/publish-container.sh b/bin/ubuntu-14.04-erlang-18/publish-container.sh
index 3c32aed..d3ca014 100755
--- a/bin/ubuntu-14.04-erlang-18/publish-container.sh
+++ b/bin/ubuntu-14.04-erlang-18/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-ubuntu-14.04-erlang-18.2
+docker push couchdbdev/ubuntu-14.04-erlang-18.2
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-erlang-default/create-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-erlang-default/create-container.sh b/bin/ubuntu-14.04-erlang-default/create-container.sh
index bbbf1b3..ea30c6c 100755
--- a/bin/ubuntu-14.04-erlang-default/create-container.sh
+++ b/bin/ubuntu-14.04-erlang-default/create-container.sh
@@ -23,6 +23,6 @@ set -e
# build context (because they need the Ansible files).
pushd `dirname $0`/../.. > /dev/null
-docker build -f dockerfiles/ubuntu-14.04-erlang-default -t couchdbdev/couchdb-build-ubuntu-14.04-erlang-default .
+docker build -f dockerfiles/ubuntu-14.04-erlang-default -t couchdbdev/ubuntu-14.04-erlang-default .
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-erlang-default/enter-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-erlang-default/enter-container.sh b/bin/ubuntu-14.04-erlang-default/enter-container.sh
index 25dcbb6..2bf1dec 100755
--- a/bin/ubuntu-14.04-erlang-default/enter-container.sh
+++ b/bin/ubuntu-14.04-erlang-default/enter-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker run -it couchdbdev/couchdb-build-ubuntu-14.04-erlang-default bash
+docker run -it couchdbdev/ubuntu-14.04-erlang-default bash
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/bin/ubuntu-14.04-erlang-default/publish-container.sh
----------------------------------------------------------------------
diff --git a/bin/ubuntu-14.04-erlang-default/publish-container.sh b/bin/ubuntu-14.04-erlang-default/publish-container.sh
index bd6c3bc..39b117a 100755
--- a/bin/ubuntu-14.04-erlang-default/publish-container.sh
+++ b/bin/ubuntu-14.04-erlang-default/publish-container.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-docker push couchdbdev/couchdb-build-ubuntu-14.04-erlang-default
+docker push couchdbdev/ubuntu-14.04-erlang-default
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/dockerfiles/centos-7-erlang-18
----------------------------------------------------------------------
diff --git a/dockerfiles/centos-7-erlang-18 b/dockerfiles/centos-7-erlang-18
index 901ef6a..35fc8fa 100644
--- a/dockerfiles/centos-7-erlang-18
+++ b/dockerfiles/centos-7-erlang-18
@@ -17,7 +17,7 @@
# NOTE: All docker files need to be run from ../../, that is
# docker build -f /docker/<container>/Dockerfile
-FROM couchdbdev/couchdb-build-centos-7-base:latest
+FROM couchdbdev/centos-7-base:latest
# Run Ansible to provision container with Erlang 18.2
RUN ansible-playbook centos-7-erlang-18.yml \
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/dockerfiles/centos-7-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/centos-7-erlang-default b/dockerfiles/centos-7-erlang-default
index 49c428f..1a14035 100644
--- a/dockerfiles/centos-7-erlang-default
+++ b/dockerfiles/centos-7-erlang-default
@@ -17,7 +17,7 @@
# NOTE: All docker files need to be run from ../../, that is
# docker build -f /docker/<container>/Dockerfile
-FROM couchdbdev/couchdb-build-centos-7-base:latest
+FROM couchdbdev/centos-7-base:latest
# Run Ansible to provision container with CentOS' default Erlang
RUN ansible-playbook centos-7-erlang-default.yml \
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/dockerfiles/debian-8-erlang-18
----------------------------------------------------------------------
diff --git a/dockerfiles/debian-8-erlang-18 b/dockerfiles/debian-8-erlang-18
index 9d97e3c..62a5188 100644
--- a/dockerfiles/debian-8-erlang-18
+++ b/dockerfiles/debian-8-erlang-18
@@ -17,7 +17,7 @@
# NOTE: All docker files need to be run from ../../, that is
# docker build -f /docker/<container>/Dockerfile
-FROM couchdbdev/couchdb-build-debian-8-base:latest
+FROM couchdbdev/debian-8-base:latest
# Run Ansible to provision container with Erlang 18.2
RUN ansible-playbook debian-8-erlang-18.yml \
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/dockerfiles/debian-8-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/debian-8-erlang-default b/dockerfiles/debian-8-erlang-default
index cf8cdb3..d7f86a5 100644
--- a/dockerfiles/debian-8-erlang-default
+++ b/dockerfiles/debian-8-erlang-default
@@ -17,7 +17,7 @@
# NOTE: All docker files need to be run from ../../, that is
# docker build -f /docker/<container>/Dockerfile
-FROM couchdbdev/couchdb-build-debian-8-base:latest
+FROM couchdbdev/debian-8-base:latest
# Run Ansible to provision container with Debian's default Erlang
RUN ansible-playbook debian-8-erlang-default.yml \
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/dockerfiles/ubuntu-14.04-erlang-18
----------------------------------------------------------------------
diff --git a/dockerfiles/ubuntu-14.04-erlang-18 b/dockerfiles/ubuntu-14.04-erlang-18
index 005508c..f5e967e 100644
--- a/dockerfiles/ubuntu-14.04-erlang-18
+++ b/dockerfiles/ubuntu-14.04-erlang-18
@@ -17,7 +17,7 @@
# NOTE: All docker files need to be run from ../../, that is
# docker build -f /docker/<container>/Dockerfile
-FROM couchdbdev/couchdb-build-ubuntu-14.04-base:latest
+FROM couchdbdev/ubuntu-14.04-base:latest
# Run Ansible to provision container with Erlang 18.2
RUN ansible-playbook ubuntu-14.04-erlang-18.yml \
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/dockerfiles/ubuntu-14.04-erlang-default
----------------------------------------------------------------------
diff --git a/dockerfiles/ubuntu-14.04-erlang-default b/dockerfiles/ubuntu-14.04-erlang-default
index 31ae04e..603d1e0 100644
--- a/dockerfiles/ubuntu-14.04-erlang-default
+++ b/dockerfiles/ubuntu-14.04-erlang-default
@@ -17,7 +17,7 @@
# NOTE: All docker files need to be run from ../../, that is
# docker build -f /docker/<container>/Dockerfile
-FROM couchdbdev/couchdb-build-ubuntu-14.04-base:latest
+FROM couchdbdev/ubuntu-14.04-base:latest
# Run Ansible to provision container with Ubuntu's default Erlang
RUN ansible-playbook ubuntu-14.04-erlang-default.yml \
http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/51f2988d/jenkins/build.sh
----------------------------------------------------------------------
diff --git a/jenkins/build.sh b/jenkins/build.sh
index 8900c4e..63e77d1 100755
--- a/jenkins/build.sh
+++ b/jenkins/build.sh
@@ -34,7 +34,7 @@ set -xe
COUCHDB_CI_DIRECTORY=$( cd "$( dirname "$0" )/.." && pwd )
cd "$COUCHDB_CI_DIRECTORY"
-DOCKER_IMAGE="couchdbdev/couchdb-build-"
+DOCKER_IMAGE="couchdbdev/"
DOCKER_OPTIONS=""
case $OS in