Repository: couchdb-ci Updated Branches: refs/heads/master 066daa75c -> 48c8ad4c8
fix CentOS 7 with default Erlang Project: http://git-wip-us.apache.org/repos/asf/couchdb-ci/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ci/commit/8b855112 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ci/tree/8b855112 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ci/diff/8b855112 Branch: refs/heads/master Commit: 8b855112b7e00c1be08b83b7a2b04be32852ed10 Parents: 066daa7 Author: Bastian Krol <[email protected]> Authored: Mon Feb 8 15:17:26 2016 +0100 Committer: Bastian Krol <[email protected]> Committed: Mon Feb 8 15:17:26 2016 +0100 ---------------------------------------------------------------------- ansible/roles/erlang-default-centos/tasks/main.yml | 12 +----------- docker/centos-7-erlang-default/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8b855112/ansible/roles/erlang-default-centos/tasks/main.yml ---------------------------------------------------------------------- diff --git a/ansible/roles/erlang-default-centos/tasks/main.yml b/ansible/roles/erlang-default-centos/tasks/main.yml index dfe0a8b..61e8fc3 100644 --- a/ansible/roles/erlang-default-centos/tasks/main.yml +++ b/ansible/roles/erlang-default-centos/tasks/main.yml @@ -18,14 +18,4 @@ - name: install default Erlang version yum: name={{item}} state=present with_items: - - erlang-asn1 - - erlang-erts - - erlang-os_mon - - erlang-xmerl - -# required for make check and make dialyze -- name: install packages required to build CouchDB - yum: name={{item}} state=present - with_items: - - erlang-eunit - - erlang-dialyzer + - erlang http://git-wip-us.apache.org/repos/asf/couchdb-ci/blob/8b855112/docker/centos-7-erlang-default/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/centos-7-erlang-default/Dockerfile b/docker/centos-7-erlang-default/Dockerfile index 851ff1e..7298913 100644 --- a/docker/centos-7-erlang-default/Dockerfile +++ b/docker/centos-7-erlang-default/Dockerfile @@ -33,6 +33,6 @@ RUN ansible-playbook site.yml \ --connection=local \ --inventory-file=./docker-inventories/centos-7-erlang-default -# USER couchdb +USER couchdb CMD ["/home/couchdb/build-ci.sh"]
