diff --git a/hacking/titotest-centos-6/Dockerfile b/hacking/titotest-centos-6/Dockerfile index 32fb8b1..8dc1be0 100644 --- a/hacking/titotest-centos-6/Dockerfile +++ b/hacking/titotest-centos-6/Dockerfile @@ -4,15 +4,6 @@ FROM centos:6 # http://jumanjiman.github.io/ MAINTAINER Paul Morgan -# NOTE: runtests.sh hard-links tito.spec into this directory on-the-fly -# to work around https://github.com/dotcloud/docker/issues/1676 -ADD tito.spec /tmp/tito.spec - -# Install build dependencies. -RUN yum -y install yum-utils \ - ; yum-builddep -y /tmp/tito.spec \ - ; yum clean all - # Install test dependencies. It would be nice to add these as # build deps and add %check to tito.spec in accordance with # https://fedoraproject.org/wiki/QA/Testing_in_check @@ -40,6 +31,15 @@ RUN useradd sandbox RUN git config --system user.email "sandbox@example.com" RUN git config --system user.name "sandbox" +# NOTE: runtests.sh hard-links tito.spec into this directory on-the-fly +# to work around https://github.com/dotcloud/docker/issues/1676 +ADD tito.spec /tmp/tito.spec + +# Install build dependencies. +RUN yum -y install yum-utils \ + ; yum-builddep -y /tmp/tito.spec \ + ; yum clean all + USER sandbox VOLUME ["/home/sandbox"] WORKDIR /home/sandbox diff --git a/hacking/titotest-fedora-21/Dockerfile b/hacking/titotest-fedora-21/Dockerfile index 75e97fc..76763a2 100644 --- a/hacking/titotest-fedora-21/Dockerfile +++ b/hacking/titotest-fedora-21/Dockerfile @@ -4,10 +4,6 @@ FROM fedora:21 # http://jumanjiman.github.io/ MAINTAINER Paul Morgan -# NOTE: runtests.sh hard-links tito.spec into this directory on-the-fly -# to work around https://github.com/dotcloud/docker/issues/1676 -ADD tito.spec /tmp/tito.spec - # Install build dependencies. RUN yum -y install \ yum-utils \ @@ -20,13 +16,17 @@ RUN yum -y install \ python3-nose \ python3-pep8 -RUN yum-builddep -y /tmp/tito.spec -RUN yum clean all - RUN useradd sandbox RUN git config --system user.email "sandbox@example.com" RUN git config --system user.name "sandbox" +# NOTE: runtests.sh hard-links tito.spec into this directory on-the-fly +# to work around https://github.com/dotcloud/docker/issues/1676 +ADD tito.spec /tmp/tito.spec + +RUN yum-builddep -y /tmp/tito.spec +RUN yum clean all + USER sandbox VOLUME ["/home/sandbox"] WORKDIR /home/sandbox diff --git a/hacking/titotest-fedora-rawhide/Dockerfile b/hacking/titotest-fedora-rawhide/Dockerfile index 359a8f5..bebe025 100644 --- a/hacking/titotest-fedora-rawhide/Dockerfile +++ b/hacking/titotest-fedora-rawhide/Dockerfile @@ -4,10 +4,6 @@ FROM fedora:rawhide # http://jumanjiman.github.io/ MAINTAINER Paul Morgan -# NOTE: runtests.sh hard-links tito.spec into this directory on-the-fly -# to work around https://github.com/dotcloud/docker/issues/1676 -ADD tito.spec /tmp/tito.spec - # Install build dependencies. RUN yum -y install \ yum-utils \ @@ -20,13 +16,17 @@ RUN yum -y install \ python3-nose \ python3-pep8 -RUN yum-builddep -y /tmp/tito.spec -RUN yum clean all - RUN useradd sandbox RUN git config --system user.email "sandbox@example.com" RUN git config --system user.name "sandbox" +# NOTE: runtests.sh hard-links tito.spec into this directory on-the-fly +# to work around https://github.com/dotcloud/docker/issues/1676 +ADD tito.spec /tmp/tito.spec + +RUN yum-builddep -y /tmp/tito.spec +RUN yum clean all + USER sandbox VOLUME ["/home/sandbox"] WORKDIR /home/sandbox