From 418562d0127333782b8c82d0a92777f73ce4c573 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Mon, 2 Oct 2017 21:43:42 +0000 Subject: [PATCH] Revert "update osbs buildroot container Dockerfile for prod" This reverts commit 1cdcd2e53ef347db83bb4f1eb359e19b43be6891. --- files/osbs/buildroot-Dockerfile-production.j2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/files/osbs/buildroot-Dockerfile-production.j2 b/files/osbs/buildroot-Dockerfile-production.j2 index 0de835a94c..fcc55681e2 100644 --- a/files/osbs/buildroot-Dockerfile-production.j2 +++ b/files/osbs/buildroot-Dockerfile-production.j2 @@ -1,8 +1,9 @@ -FROM registry.fedoraproject.org/fedora +FROM fedora:24 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-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 ./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"] +