From b5613c90d144a2f7e08ca03e9fe5f46942d340c5 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Fri, 10 Nov 2017 17:02:55 +0000 Subject: [PATCH] make osbs stage and prod buildroot Dockerfile the same Signed-off-by: Adam Miller --- files/osbs/buildroot-Dockerfile-staging.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/files/osbs/buildroot-Dockerfile-staging.j2 b/files/osbs/buildroot-Dockerfile-staging.j2 index 0de835a94c..8f9ef88c18 100644 --- a/files/osbs/buildroot-Dockerfile-staging.j2 +++ b/files/osbs/buildroot-Dockerfile-staging.j2 @@ -1,8 +1,9 @@ FROM registry.fedoraproject.org/fedora ADD ./infra-tags.repo /etc/yum.repos.d/infra-tags.repo -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 dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python-setuptools e2fsprogs koji python-backports-lzma osbs-client python-osbs-client gssproxy fedpkg python-docker-squash atomic-reactor python-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 ["python3", "/usr/bin/atomic-reactor", "--verbose", "inside-build"] +CMD ["python2", "/usr/bin/atomic-reactor", "--verbose", "inside-build"] +