annotate contrib/docker/centos5 @ 22841:18b3869179f9

merge: make error message consistent with other commands If a merge is attempted when another merge is already ongoing, we give the message "outstanding uncommitted merges". Many other commands (such as backout, rebase, histedit) give the same message in singular form. Since the singular form also seems to make more sense, let's use that for 'hg merge' as well.
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 14:16:53 -0700
parents 49ea49823769
children eea2e0f76a24
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22443
d8818616c45e docker: add CentOS 5
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
1 FROM saltstack/centos-5-minimal
d8818616c45e docker: add CentOS 5
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
2 RUN yum install -y gcc make rpm-build gettext tar
d8818616c45e docker: add CentOS 5
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
3 RUN yum install -y python-devel python-docutils
22444
49ea49823769 dockerrpm: create a yum/dnf repo from the generated rpms
Mads Kiilerich <madski@unity3d.com>
parents: 22443
diff changeset
4 # For creating repo meta data
49ea49823769 dockerrpm: create a yum/dnf repo from the generated rpms
Mads Kiilerich <madski@unity3d.com>
parents: 22443
diff changeset
5 RUN yum install -y createrepo
22443
d8818616c45e docker: add CentOS 5
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset
6 RUN yum install -y readline-devel openssl-devel ncurses-devel zlib-devel bzip2-devel