diff options
| author | Adam Miller <admiller@redhat.com> | 2017-07-19 15:33:25 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2017-07-19 15:34:13 +0000 |
| commit | 7b2c0aa4689d10aa32a79c45df68f2390bfbb091 (patch) | |
| tree | 57c7dd2d9d2f75a9e5cfecf1567e34b0024afa5b | |
| parent | 49714589fe764d6c60f9c447070689ff10b74a39 (diff) | |
| download | ansible-7b2c0aa4689d10aa32a79c45df68f2390bfbb091.tar.gz ansible-7b2c0aa4689d10aa32a79c45df68f2390bfbb091.tar.xz ansible-7b2c0aa4689d10aa32a79c45df68f2390bfbb091.zip | |
update osbs buildroot in stage to use python3 and our registry base image
Signed-off-by: Adam Miller <admiller@redhat.com>
| -rw-r--r-- | files/osbs/buildroot-Dockerfile-staging.j2 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/files/osbs/buildroot-Dockerfile-staging.j2 b/files/osbs/buildroot-Dockerfile-staging.j2 index 17c15735c..0de835a94 100644 --- a/files/osbs/buildroot-Dockerfile-staging.j2 +++ b/files/osbs/buildroot-Dockerfile-staging.j2 @@ -1,9 +1,8 @@ -FROM fedora:24 +FROM registry.fedoraproject.org/fedora ADD ./infra-tags.repo /etc/yum.repos.d/infra-tags.repo -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 atomic-reactor python-atomic-reactor* +RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python3-docker-py python3-setuptools e2fsprogs koji osbs-client gssproxy fedpkg python3-docker-squash atomic-reactor python3-atomic-reactor* go-md2man RUN sed -i 's|.*default_ccache_name.*| default_ccache_name = DIR:/tmp/ccache_%{uid}|g' /etc/krb5.conf ADD ./krb5.osbs_{{osbs_url}}.keytab /etc/ ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs.ca.crt RUN update-ca-trust -CMD ["python2", "/usr/bin/atomic-reactor", "--verbose", "inside-build"] +CMD ["python3", "/usr/bin/atomic-reactor", "--verbose", "inside-build"] |