mirror of
https://github.com/rpm-software-management/tito.git
synced 2025-02-23 20:22:46 +00:00
Add tito spec later in test dockerfiles.
It changes a lot and rebuilding everything sucks.
This commit is contained in:
parent
f9b0212529
commit
dcbbb7f01a
3 changed files with 23 additions and 23 deletions
|
@ -4,15 +4,6 @@ FROM centos:6
|
||||||
# http://jumanjiman.github.io/
|
# http://jumanjiman.github.io/
|
||||||
MAINTAINER Paul Morgan <jumanjiman@gmail.com>
|
MAINTAINER Paul Morgan <jumanjiman@gmail.com>
|
||||||
|
|
||||||
# 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
|
# Install test dependencies. It would be nice to add these as
|
||||||
# build deps and add %check to tito.spec in accordance with
|
# build deps and add %check to tito.spec in accordance with
|
||||||
# https://fedoraproject.org/wiki/QA/Testing_in_check
|
# 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.email "sandbox@example.com"
|
||||||
RUN git config --system user.name "sandbox"
|
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
|
USER sandbox
|
||||||
VOLUME ["/home/sandbox"]
|
VOLUME ["/home/sandbox"]
|
||||||
WORKDIR /home/sandbox
|
WORKDIR /home/sandbox
|
||||||
|
|
|
@ -4,10 +4,6 @@ FROM fedora:21
|
||||||
# http://jumanjiman.github.io/
|
# http://jumanjiman.github.io/
|
||||||
MAINTAINER Paul Morgan <jumanjiman@gmail.com>
|
MAINTAINER Paul Morgan <jumanjiman@gmail.com>
|
||||||
|
|
||||||
# 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.
|
# Install build dependencies.
|
||||||
RUN yum -y install \
|
RUN yum -y install \
|
||||||
yum-utils \
|
yum-utils \
|
||||||
|
@ -20,13 +16,17 @@ RUN yum -y install \
|
||||||
python3-nose \
|
python3-nose \
|
||||||
python3-pep8
|
python3-pep8
|
||||||
|
|
||||||
RUN yum-builddep -y /tmp/tito.spec
|
|
||||||
RUN yum clean all
|
|
||||||
|
|
||||||
RUN useradd sandbox
|
RUN useradd sandbox
|
||||||
RUN git config --system user.email "sandbox@example.com"
|
RUN git config --system user.email "sandbox@example.com"
|
||||||
RUN git config --system user.name "sandbox"
|
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
|
USER sandbox
|
||||||
VOLUME ["/home/sandbox"]
|
VOLUME ["/home/sandbox"]
|
||||||
WORKDIR /home/sandbox
|
WORKDIR /home/sandbox
|
||||||
|
|
|
@ -4,10 +4,6 @@ FROM fedora:rawhide
|
||||||
# http://jumanjiman.github.io/
|
# http://jumanjiman.github.io/
|
||||||
MAINTAINER Paul Morgan <jumanjiman@gmail.com>
|
MAINTAINER Paul Morgan <jumanjiman@gmail.com>
|
||||||
|
|
||||||
# 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.
|
# Install build dependencies.
|
||||||
RUN yum -y install \
|
RUN yum -y install \
|
||||||
yum-utils \
|
yum-utils \
|
||||||
|
@ -20,13 +16,17 @@ RUN yum -y install \
|
||||||
python3-nose \
|
python3-nose \
|
||||||
python3-pep8
|
python3-pep8
|
||||||
|
|
||||||
RUN yum-builddep -y /tmp/tito.spec
|
|
||||||
RUN yum clean all
|
|
||||||
|
|
||||||
RUN useradd sandbox
|
RUN useradd sandbox
|
||||||
RUN git config --system user.email "sandbox@example.com"
|
RUN git config --system user.email "sandbox@example.com"
|
||||||
RUN git config --system user.name "sandbox"
|
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
|
USER sandbox
|
||||||
VOLUME ["/home/sandbox"]
|
VOLUME ["/home/sandbox"]
|
||||||
WORKDIR /home/sandbox
|
WORKDIR /home/sandbox
|
||||||
|
|
Loading…
Add table
Reference in a new issue