From d43abdd70ff8ba59c203a003acdf4f5395b73914 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 7 Dec 2016 22:45:54 +0000 Subject: [PATCH] OSBS buildroot set ot f24 for now as that's what's been tested/validated Signed-off-by: Adam Miller --- files/osbs/buildroot-Dockerfile-production.j2 | 2 +- files/osbs/buildroot-Dockerfile-staging.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/osbs/buildroot-Dockerfile-production.j2 b/files/osbs/buildroot-Dockerfile-production.j2 index f8a895b0c8..dc047fa184 100644 --- a/files/osbs/buildroot-Dockerfile-production.j2 +++ b/files/osbs/buildroot-Dockerfile-production.j2 @@ -1,4 +1,4 @@ -FROM fedora:latest +FROM fedora:24 ADD ./infrastructure.repo /etc/yum.repos.d/infrastructure.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 sed -i 's|.*default_ccache_name.*| default_ccache_name = DIR:/tmp/ccache_%{uid}|g' /etc/krb5.conf diff --git a/files/osbs/buildroot-Dockerfile-staging.j2 b/files/osbs/buildroot-Dockerfile-staging.j2 index b1ff269eda..5b69d5a990 100644 --- a/files/osbs/buildroot-Dockerfile-staging.j2 +++ b/files/osbs/buildroot-Dockerfile-staging.j2 @@ -1,4 +1,4 @@ -FROM fedora:latest +FROM fedora:24 ADD ./infrastructure.repo /etc/yum.repos.d/infrastructure.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*