Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Clean up OSBS items

Browse source 
- Remove osbs-client from koji-hub, no longer needed
    - Set site-specific OSBS plugins config
    - Remove atomic-reactor.tar.gz hardlinking for docker, no longer
      needed
    - Update osbs/atomic-reactor buildroot to user RPM version of
      atomic-reactor and not source shipped with RPM (fixed issue
      so this works now)

Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-12-02 23:17:04 +00:00
parent aa0a4b4377
commit debd16df22
6 changed files with 44 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
files/osbs/buildroot-Dockerfile-staging.j2
View file

@ -1,10 +1,8 @@
FROM fedora:latest
RUN curl -o /etc/yum.repos.d/maxamillion-atomic-reactor-copr.repo https://copr.fedorainfracloud.org/coprs/maxamillion/atomic-reactor/repo/fedora-24/maxamillion-atomic-reactor-fedora-24.repo
RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python-docker-py python-setuptools e2fsprogs koji python-backports-lzma osbs-client gssproxy fedpkg python-docker-squash
RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python-docker-py python-setuptools e2fsprogs koji python-backports-lzma osbs-client gssproxy fedpkg python-docker-squash atomic-reactor python-atomic-reactor*
RUN sed -i 's|.*default_ccache_name.*| default_ccache_name = DIR:/tmp/ccache_%{uid}|g' /etc/krb5.conf
ADD ./atomic-reactor.tar.gz /tmp/
ADD ./krb5.osbs_{{osbs_url}}.keytab /etc/
RUN cd /tmp/atomic-reactor-*/ && python setup.py install
ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs.ca.crt
RUN update-ca-trust
CMD ["atomic-reactor", "--verbose", "inside-build"]
CMD ["python2", "/usr/bin/atomic-reactor", "--verbose", "inside-build"]