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 <[email protected]> Authored: Thu Mar 16 14:10:30 2017 -0700 Committer: Joan Touzet <[email protected]> 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
