Repository: couchdb-ci Updated Branches: refs/heads/master 7fa91caea -> 396f77a46
Erlang 18->18.2; copy ansible into every image Previously, the Dockerfile only copied the ansible/ directory into the -base images. This means that if you want to add a new version of Erlang (for instance), you have to rebuild *all* of the images just to populate the /ansible directory to the child images. So instead we simply re-ADD the /ansible directory into each child image. This allows for generation of new os-erlang-XX.X images (or other things, in the future) without respinning every single image. Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/a0ad40dd Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/a0ad40dd Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/a0ad40dd Branch: refs/heads/master Commit: a0ad40ddf4ecb09c18b437d6c9e8c9b29cf06794 Parents: 7fa91ca Author: Joan Touzet <[email protected]> Authored: Thu Mar 16 22:21:43 2017 -0700 Committer: Joan Touzet <[email protected]> Committed: Thu Mar 16 22:21:43 2017 -0700 ---------------------------------------------------------------------- ansible/centos-7-erlang-18.2.yml | 21 +++++++ ansible/centos-7-erlang-18.yml | 21 ------- ansible/debian-8-erlang-18.2.yml | 22 +++++++ ansible/debian-8-erlang-18.yml | 22 ------- ansible/roles/erlang-18-centos/tasks/main.yml | 23 ------- ansible/roles/erlang-18-debian/tasks/main.yml | 46 -------------- ansible/roles/erlang-18.2-centos/tasks/main.yml | 23 +++++++ ansible/roles/erlang-18.2-debian/tasks/main.yml | 66 ++++++++++++++++++++ ansible/run-ansible-local.sh | 2 +- ansible/ubuntu-14.04-erlang-18.2.yml | 22 +++++++ ansible/ubuntu-14.04-erlang-18.yml | 22 ------- bin/centos-7-erlang-18.2/create-container.sh | 28 +++++++++ bin/centos-7-erlang-18.2/enter-container.sh | 20 ++++++ bin/centos-7-erlang-18.2/publish-container.sh | 20 ++++++ .../run-build-in-container.sh | 24 +++++++ bin/centos-7-erlang-18/create-container.sh | 28 --------- bin/centos-7-erlang-18/enter-container.sh | 20 ------ bin/centos-7-erlang-18/publish-container.sh | 20 ------ .../run-build-in-container.sh | 24 ------- bin/debian-8-erlang-18.2/create-container.sh | 28 +++++++++ bin/debian-8-erlang-18.2/enter-container.sh | 20 ++++++ bin/debian-8-erlang-18.2/publish-container.sh | 20 ++++++ .../run-build-in-container.sh | 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 | 24 ------- .../create-container.sh | 28 +++++++++ bin/ubuntu-14.04-erlang-18.2/enter-container.sh | 20 ++++++ .../publish-container.sh | 20 ++++++ .../run-build-in-container.sh | 24 +++++++ bin/ubuntu-14.04-erlang-18/create-container.sh | 28 --------- bin/ubuntu-14.04-erlang-18/enter-container.sh | 20 ------ bin/ubuntu-14.04-erlang-18/publish-container.sh | 20 ------ .../run-build-in-container.sh | 24 ------- dockerfiles/centos-7-erlang-18 | 29 --------- dockerfiles/centos-7-erlang-18.2 | 34 ++++++++++ dockerfiles/centos-7-erlang-default | 5 ++ dockerfiles/debian-8-erlang-18 | 29 --------- dockerfiles/debian-8-erlang-18.2 | 34 ++++++++++ dockerfiles/debian-8-erlang-default | 5 ++ dockerfiles/ubuntu-14.04-erlang-18 | 29 --------- dockerfiles/ubuntu-14.04-erlang-18.2 | 34 ++++++++++ dockerfiles/ubuntu-14.04-erlang-default | 5 ++ 44 files changed, 548 insertions(+), 498 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/centos-7-erlang-18.2.yml ---------------------------------------------------------------------- diff --git a/ansible/centos-7-erlang-18.2.yml b/ansible/centos-7-erlang-18.2.yml new file mode 100644 index 0000000..492f252 --- /dev/null +++ b/ansible/centos-7-erlang-18.2.yml @@ -0,0 +1,21 @@ +# 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. + +- hosts: couchdb-ci-worker + remote_user: root + roles: + - erlang-18-centos http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/centos-7-erlang-18.yml ---------------------------------------------------------------------- diff --git a/ansible/centos-7-erlang-18.yml b/ansible/centos-7-erlang-18.yml deleted file mode 100644 index 492f252..0000000 --- a/ansible/centos-7-erlang-18.yml +++ /dev/null @@ -1,21 +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. - -- hosts: couchdb-ci-worker - remote_user: root - roles: - - erlang-18-centos http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/debian-8-erlang-18.2.yml ---------------------------------------------------------------------- diff --git a/ansible/debian-8-erlang-18.2.yml b/ansible/debian-8-erlang-18.2.yml new file mode 100644 index 0000000..04175c3 --- /dev/null +++ b/ansible/debian-8-erlang-18.2.yml @@ -0,0 +1,22 @@ +# 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. + +- hosts: couchdb-ci-worker + remote_user: root + roles: + - debian-8 + - erlang-18.2-debian http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/debian-8-erlang-18.yml ---------------------------------------------------------------------- diff --git a/ansible/debian-8-erlang-18.yml b/ansible/debian-8-erlang-18.yml deleted file mode 100644 index 953dbaf..0000000 --- a/ansible/debian-8-erlang-18.yml +++ /dev/null @@ -1,22 +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. - -- hosts: couchdb-ci-worker - remote_user: root - roles: - - debian-8 - - erlang-18-debian http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/roles/erlang-18-centos/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-18-centos/tasks/main.yml b/ansible/roles/erlang-18-centos/tasks/main.yml deleted file mode 100644 index f082cbb..0000000 --- a/ansible/roles/erlang-18-centos/tasks/main.yml +++ /dev/null @@ -1,23 +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. - -- name: download and install Erlang 18 - yum: - name: "https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_18.2-1~centos~6_amd64.rpm"; - -- name: clean up yum cache - command: yum clean all http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/roles/erlang-18-debian/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-18-debian/tasks/main.yml b/ansible/roles/erlang-18-debian/tasks/main.yml deleted file mode 100644 index 0deb39a..0000000 --- a/ansible/roles/erlang-18-debian/tasks/main.yml +++ /dev/null @@ -1,46 +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. - -- name: import the Erlang Solutions key into apt - apt_key: - url: "{{ erlang_solutions_key_url }}" - state: present - # validate_certs: no - -- name: add Erlang Solutions deb repository - apt_repository: - repo: "{{ erlang_solutions_apt_repo_url }}" - state: present - -# apt-get update -- name: update apt cache - apt: - update_cache: yes - -- name: install Erlang 18.x - apt: name={{item}} state=present install_recommends=no - with_items: - - erlang-dev=1:18.2 - - erlang-nox=1:18.2 - - erlang=1:18.2 - -# required for make check and make dialyze -- name: install packages required to build CouchDB - apt: name={{item}} state=present install_recommends=no - with_items: - - erlang-eunit=1:18.2 - - erlang-dialyzer=1:18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/roles/erlang-18.2-centos/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-18.2-centos/tasks/main.yml b/ansible/roles/erlang-18.2-centos/tasks/main.yml new file mode 100644 index 0000000..242f5f2 --- /dev/null +++ b/ansible/roles/erlang-18.2-centos/tasks/main.yml @@ -0,0 +1,23 @@ +# 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. + +- name: download and install Erlang 18.2 + yum: + name: "https://packages.erlang-solutions.com/erlang/esl-erlang/FLAVOUR_1_general/esl-erlang_18.2-1~centos~7_amd64.rpm"; + +- name: clean up yum cache + command: yum clean all http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/roles/erlang-18.2-debian/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-18.2-debian/tasks/main.yml b/ansible/roles/erlang-18.2-debian/tasks/main.yml new file mode 100644 index 0000000..fd74075 --- /dev/null +++ b/ansible/roles/erlang-18.2-debian/tasks/main.yml @@ -0,0 +1,66 @@ +# 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. + +- name: import the Erlang Solutions key into apt + apt_key: + url: "{{ erlang_solutions_key_url }}" + state: present + # validate_certs: no + +- name: add Erlang Solutions deb repository + apt_repository: + repo: "{{ erlang_solutions_apt_repo_url }}" + state: present + +# apt-get update +- name: update apt cache + apt: + update_cache: yes + +- name: install Erlang 18.2 + apt: name={{item}} state=present install_recommends=no + with_items: + - erlang-dev=1:18.2 + - erlang-nox=1:18.2 + - erlang-base=1:18.2 + - erlang-asn1=1:18.2 + - erlang-corba=1:18.2 + - erlang-crypto=1:18.2 + - erlang-diameter=1:18.2 + - erlang-edoc=1:18.2 + - erlang-eldap=1:18.2 + - erlang-erl-docgen=1:18.2 + - erlang-eunit=1:18.2 + - erlang-ic=1:18.2 + - erlang-inets=1:18.2 + - erlang-inviso=1:18.2 + - erlang-mnesia=1:18.2 + - erlang-odbc=1:18.2 + - erlang-os-mon=1:18.2 + - erlang-parsetools=1:18.2 + - erlang-percept=1:18.2 + - erlang-public-key=1:18.2 + - erlang-runtime-tools=1:18.2 + - erlang-snmp=1:18.2 + - erlang-ssh=1:18.2 + - erlang-ssl=1:18.2 + - erlang-syntax-tools=1:18.2 + - erlang-tools=1:18.2 + - erlang-webtool=1:18.2 + - erlang-xmerl=1:18.2 + - erlang-eunit=1:18.2 + - erlang-dialyzer=1:18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/run-ansible-local.sh ---------------------------------------------------------------------- diff --git a/ansible/run-ansible-local.sh b/ansible/run-ansible-local.sh index 8aa5858..aae21e9 100755 --- a/ansible/run-ansible-local.sh +++ b/ansible/run-ansible-local.sh @@ -40,7 +40,7 @@ fi ANSIBLE_FORCE_COLOR=1 ANSIBLE_NOCOWS=1 \ ansible-playbook \ --connection=local \ - --inventory-file=./docker-inventories/ubuntu-14.04-erlang-18 \ + --inventory-file=./docker-inventories/ubuntu-14.04-erlang-18.2 \ --sudo \ $TAG \ site.yml http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/ubuntu-14.04-erlang-18.2.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-14.04-erlang-18.2.yml b/ansible/ubuntu-14.04-erlang-18.2.yml new file mode 100644 index 0000000..d94bba0 --- /dev/null +++ b/ansible/ubuntu-14.04-erlang-18.2.yml @@ -0,0 +1,22 @@ +# 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. + +- hosts: couchdb-ci-worker + remote_user: root + roles: + - ubuntu-1404 + - erlang-18.2-debian http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/ansible/ubuntu-14.04-erlang-18.yml ---------------------------------------------------------------------- diff --git a/ansible/ubuntu-14.04-erlang-18.yml b/ansible/ubuntu-14.04-erlang-18.yml deleted file mode 100644 index e1f2792..0000000 --- a/ansible/ubuntu-14.04-erlang-18.yml +++ /dev/null @@ -1,22 +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. - -- hosts: couchdb-ci-worker - remote_user: root - roles: - - ubuntu-1404 - - erlang-18-debian http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/centos-7-erlang-18.2/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.2/create-container.sh b/bin/centos-7-erlang-18.2/create-container.sh new file mode 100755 index 0000000..349d711 --- /dev/null +++ b/bin/centos-7-erlang-18.2/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 dockerfiles/centos-7-erlang-18.2 -t couchdbdev/centos-7-erlang-18.2 . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/centos-7-erlang-18.2/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.2/enter-container.sh b/bin/centos-7-erlang-18.2/enter-container.sh new file mode 100755 index 0000000..a6ac0c1 --- /dev/null +++ b/bin/centos-7-erlang-18.2/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 couchdbdev/centos-7-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/centos-7-erlang-18.2/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.2/publish-container.sh b/bin/centos-7-erlang-18.2/publish-container.sh new file mode 100755 index 0000000..c1336a9 --- /dev/null +++ b/bin/centos-7-erlang-18.2/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 couchdbdev/centos-7-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/centos-7-erlang-18.2/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/centos-7-erlang-18.2/run-build-in-container.sh b/bin/centos-7-erlang-18.2/run-build-in-container.sh new file mode 100755 index 0000000..fe9aa90 --- /dev/null +++ b/bin/centos-7-erlang-18.2/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/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 +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/a0ad40dd/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 deleted file mode 100755 index 7f20ac9..0000000 --- a/bin/centos-7-erlang-18/create-container.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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 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/a0ad40dd/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 deleted file mode 100755 index a6ac0c1..0000000 --- a/bin/centos-7-erlang-18/enter-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 couchdbdev/centos-7-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/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 deleted file mode 100755 index c1336a9..0000000 --- a/bin/centos-7-erlang-18/publish-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 couchdbdev/centos-7-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/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 deleted file mode 100755 index fe9aa90..0000000 --- a/bin/centos-7-erlang-18/run-build-in-container.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 -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/a0ad40dd/bin/debian-8-erlang-18.2/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.2/create-container.sh b/bin/debian-8-erlang-18.2/create-container.sh new file mode 100755 index 0000000..095c99e --- /dev/null +++ b/bin/debian-8-erlang-18.2/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 dockerfiles/debian-8-erlang-18.2 -t couchdbdev/debian-8-erlang-18.2 . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/debian-8-erlang-18.2/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.2/enter-container.sh b/bin/debian-8-erlang-18.2/enter-container.sh new file mode 100755 index 0000000..f5b9a1a --- /dev/null +++ b/bin/debian-8-erlang-18.2/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 couchdbdev/debian-8-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/debian-8-erlang-18.2/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.2/publish-container.sh b/bin/debian-8-erlang-18.2/publish-container.sh new file mode 100755 index 0000000..fffc6c0 --- /dev/null +++ b/bin/debian-8-erlang-18.2/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 couchdbdev/debian-8-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/debian-8-erlang-18.2/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/debian-8-erlang-18.2/run-build-in-container.sh b/bin/debian-8-erlang-18.2/run-build-in-container.sh new file mode 100755 index 0000000..151e811 --- /dev/null +++ b/bin/debian-8-erlang-18.2/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/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 +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/a0ad40dd/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 deleted file mode 100755 index d004b93..0000000 --- a/bin/debian-8-erlang-18/create-container.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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 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/a0ad40dd/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 deleted file mode 100755 index f5b9a1a..0000000 --- a/bin/debian-8-erlang-18/enter-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 couchdbdev/debian-8-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/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 deleted file mode 100755 index fffc6c0..0000000 --- a/bin/debian-8-erlang-18/publish-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 couchdbdev/debian-8-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/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 deleted file mode 100755 index 151e811..0000000 --- a/bin/debian-8-erlang-18/run-build-in-container.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 -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/a0ad40dd/bin/ubuntu-14.04-erlang-18.2/create-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.2/create-container.sh b/bin/ubuntu-14.04-erlang-18.2/create-container.sh new file mode 100755 index 0000000..4c4a7be --- /dev/null +++ b/bin/ubuntu-14.04-erlang-18.2/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 dockerfiles/ubuntu-14.04-erlang-18.2 -t couchdbdev/ubuntu-14.04-erlang-18.2 . + +popd > /dev/null http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/ubuntu-14.04-erlang-18.2/enter-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.2/enter-container.sh b/bin/ubuntu-14.04-erlang-18.2/enter-container.sh new file mode 100755 index 0000000..a755d9e --- /dev/null +++ b/bin/ubuntu-14.04-erlang-18.2/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 couchdbdev/ubuntu-14.04-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/ubuntu-14.04-erlang-18.2/publish-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.2/publish-container.sh b/bin/ubuntu-14.04-erlang-18.2/publish-container.sh new file mode 100755 index 0000000..d3ca014 --- /dev/null +++ b/bin/ubuntu-14.04-erlang-18.2/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 couchdbdev/ubuntu-14.04-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/bin/ubuntu-14.04-erlang-18.2/run-build-in-container.sh ---------------------------------------------------------------------- diff --git a/bin/ubuntu-14.04-erlang-18.2/run-build-in-container.sh b/bin/ubuntu-14.04-erlang-18.2/run-build-in-container.sh new file mode 100755 index 0000000..8fe0eec --- /dev/null +++ b/bin/ubuntu-14.04-erlang-18.2/run-build-in-container.sh @@ -0,0 +1,24 @@ +#!/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 +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/a0ad40dd/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 deleted file mode 100755 index 02a8c35..0000000 --- a/bin/ubuntu-14.04-erlang-18/create-container.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/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 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/a0ad40dd/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 deleted file mode 100755 index a755d9e..0000000 --- a/bin/ubuntu-14.04-erlang-18/enter-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 couchdbdev/ubuntu-14.04-erlang-18.2 bash http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/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 deleted file mode 100755 index d3ca014..0000000 --- a/bin/ubuntu-14.04-erlang-18/publish-container.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/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 couchdbdev/ubuntu-14.04-erlang-18.2 http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/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 deleted file mode 100755 index 8fe0eec..0000000 --- a/bin/ubuntu-14.04-erlang-18/run-build-in-container.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 -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/a0ad40dd/dockerfiles/centos-7-erlang-18 ---------------------------------------------------------------------- diff --git a/dockerfiles/centos-7-erlang-18 b/dockerfiles/centos-7-erlang-18 deleted file mode 100644 index 35fc8fa..0000000 --- a/dockerfiles/centos-7-erlang-18 +++ /dev/null @@ -1,29 +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 - -# NOTE: All docker files need to be run from ../../, that is -# docker build -f /docker/<container>/Dockerfile - -FROM couchdbdev/centos-7-base:latest - -# Run Ansible to provision container with Erlang 18.2 -RUN ansible-playbook centos-7-erlang-18.yml \ - --connection=local \ - --inventory-file=./inventory/couchdb-ci-worker - -USER couchdb - -CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/dockerfiles/centos-7-erlang-18.2 ---------------------------------------------------------------------- diff --git a/dockerfiles/centos-7-erlang-18.2 b/dockerfiles/centos-7-erlang-18.2 new file mode 100644 index 0000000..828ee41 --- /dev/null +++ b/dockerfiles/centos-7-erlang-18.2 @@ -0,0 +1,34 @@ +# 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 + +FROM couchdbdev/centos-7-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Erlang 18.2 +RUN ansible-playbook centos-7-erlang-18.2.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER couchdb + +CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/dockerfiles/centos-7-erlang-default ---------------------------------------------------------------------- diff --git a/dockerfiles/centos-7-erlang-default b/dockerfiles/centos-7-erlang-default index 1a14035..9c0dd48 100644 --- a/dockerfiles/centos-7-erlang-default +++ b/dockerfiles/centos-7-erlang-default @@ -19,6 +19,11 @@ FROM couchdbdev/centos-7-base:latest +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + # Run Ansible to provision container with CentOS' default Erlang RUN ansible-playbook centos-7-erlang-default.yml \ --connection=local \ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/dockerfiles/debian-8-erlang-18 ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-8-erlang-18 b/dockerfiles/debian-8-erlang-18 deleted file mode 100644 index 62a5188..0000000 --- a/dockerfiles/debian-8-erlang-18 +++ /dev/null @@ -1,29 +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 - -# NOTE: All docker files need to be run from ../../, that is -# docker build -f /docker/<container>/Dockerfile - -FROM couchdbdev/debian-8-base:latest - -# Run Ansible to provision container with Erlang 18.2 -RUN ansible-playbook debian-8-erlang-18.yml \ - --connection=local \ - --inventory-file=./inventory/couchdb-ci-worker - -USER couchdb - -CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/dockerfiles/debian-8-erlang-18.2 ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-8-erlang-18.2 b/dockerfiles/debian-8-erlang-18.2 new file mode 100644 index 0000000..15247e5 --- /dev/null +++ b/dockerfiles/debian-8-erlang-18.2 @@ -0,0 +1,34 @@ +# 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 + +FROM couchdbdev/debian-8-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Erlang 18.2 +RUN ansible-playbook debian-8-erlang-18.2.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER couchdb + +CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/dockerfiles/debian-8-erlang-default ---------------------------------------------------------------------- diff --git a/dockerfiles/debian-8-erlang-default b/dockerfiles/debian-8-erlang-default index d7f86a5..5e23ac0 100644 --- a/dockerfiles/debian-8-erlang-default +++ b/dockerfiles/debian-8-erlang-default @@ -19,6 +19,11 @@ FROM couchdbdev/debian-8-base:latest +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + # Run Ansible to provision container with Debian's default Erlang RUN ansible-playbook debian-8-erlang-default.yml \ --connection=local \ http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/dockerfiles/ubuntu-14.04-erlang-18 ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-14.04-erlang-18 b/dockerfiles/ubuntu-14.04-erlang-18 deleted file mode 100644 index f5e967e..0000000 --- a/dockerfiles/ubuntu-14.04-erlang-18 +++ /dev/null @@ -1,29 +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 - -# NOTE: All docker files need to be run from ../../, that is -# docker build -f /docker/<container>/Dockerfile - -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 \ - --connection=local \ - --inventory-file=./inventory/couchdb-ci-worker - -USER couchdb - -CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/dockerfiles/ubuntu-14.04-erlang-18.2 ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-14.04-erlang-18.2 b/dockerfiles/ubuntu-14.04-erlang-18.2 new file mode 100644 index 0000000..5206c8b --- /dev/null +++ b/dockerfiles/ubuntu-14.04-erlang-18.2 @@ -0,0 +1,34 @@ +# 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 + +FROM couchdbdev/ubuntu-14.04-base:latest + +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + +# Run Ansible to provision container with Erlang 18.2 +RUN ansible-playbook ubuntu-14.04-erlang-18.2.yml \ + --connection=local \ + --inventory-file=./inventory/couchdb-ci-worker + +USER couchdb + +CMD ["/home/couchdb/build-ci.sh"] http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/a0ad40dd/dockerfiles/ubuntu-14.04-erlang-default ---------------------------------------------------------------------- diff --git a/dockerfiles/ubuntu-14.04-erlang-default b/dockerfiles/ubuntu-14.04-erlang-default index 603d1e0..230b7d5 100644 --- a/dockerfiles/ubuntu-14.04-erlang-default +++ b/dockerfiles/ubuntu-14.04-erlang-default @@ -19,6 +19,11 @@ FROM couchdbdev/ubuntu-14.04-base:latest +# Re-add ansible directory to pick up latest changes +# This avoids having to cascade rebuild all images when changing +# a role that only affects a child container +ADD ./ansible /ansible + # Run Ansible to provision container with Ubuntu's default Erlang RUN ansible-playbook ubuntu-14.04-erlang-default.yml \ --connection=local \
