EL6 docker tests now fully passing.

This commit is contained in:
Devan Goodwin 2015-05-08 12:07:38 -03:00
parent 70ed5db073
commit 50526722e0
2 changed files with 8 additions and 0 deletions

View file

@ -25,9 +25,15 @@ RUN yum -y install \
python-mock \
python-nose \
python-pep8 \
rpm-build \
createrepo \
tar \
; yum clean all
RUN yum install -y python-devel
RUN yum install -y which
RUN yum install -y asciidoc docbook-style-xsl libxslt rpmdevtools
RUN useradd sandbox
RUN git config --system user.email "sandbox@example.com"
RUN git config --system user.name "sandbox"
@ -36,5 +42,6 @@ USER sandbox
VOLUME ["/home/sandbox"]
WORKDIR /home/sandbox
ENV LANG C
CMD ["/bin/bash"]

View file

@ -1011,6 +1011,7 @@ class GitAnnexBuilder(NoTgzBuilder):
old_cwd = os.getcwd()
os.chdir(os.path.join(old_cwd, self.relative_project_dir))
# NOTE: 'which' may not be installed... (docker containers)
(status, output) = getstatusoutput("which git-annex")
if status != 0:
msg = "Please run 'yum install git-annex' as root."