From 86a02407587e23e0b0dfb4671ef58870b47e0131 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Oct 06 2020 08:49:33 +0000 Subject: Update OSBS buildroot container to use Fedora 33 Signed-off-by: Clement Verna --- diff --git a/files/osbs/buildroot-Dockerfile-production.j2 b/files/osbs/buildroot-Dockerfile-production.j2 index 5ea91b5..35304d8 100644 --- a/files/osbs/buildroot-Dockerfile-production.j2 +++ b/files/osbs/buildroot-Dockerfile-production.j2 @@ -1,12 +1,12 @@ -FROM registry.fedoraproject.org/fedora:31 -RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python3-setuptools e2fsprogs koji osbs-client\ +FROM registry.fedoraproject.org/fedora:33 +RUN dnf -y install --refresh dnf-plugins-core && dnf -y install moby-engine git python3-setuptools e2fsprogs koji osbs-client\ python3-osbs-client gssproxy fedpkg python3-docker-squash atomic-reactor python3-atomic-reactor* go-md2man python3-productmd\ python3-gobject python3-libmodulemd python3-pdc-client ostree flatpak-module-tools flatpak skopeo && dnf clean all ADD ./orchestrator_customize.json /usr/share/osbs/orchestrator_customize.json ADD ./worker_customize.json /usr/share/osbs/worker_customize.json ADD ./krb5.conf /etc -RUN printf '[libdefaults]\n default_ccache_name = DIR:/tmp/ccache_%%{uid}' >/etc/krb5.conf.d/ccache.conf -ADD ./krb5.osbs_{{osbs_url}}.keytab /etc/ -ADD ./ca.crt /etc/pki/ca-trust/source/anchors/osbs.ca.crt +#RUN printf '[libdefaults]\n default_ccache_name = DIR:/tmp/ccache_%%{uid}' >/etc/krb5.conf.d/ccache.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"] diff --git a/files/osbs/buildroot-Dockerfile-staging.j2 b/files/osbs/buildroot-Dockerfile-staging.j2 index 5ea91b5..cd4486c 100644 --- a/files/osbs/buildroot-Dockerfile-staging.j2 +++ b/files/osbs/buildroot-Dockerfile-staging.j2 @@ -1,5 +1,5 @@ -FROM registry.fedoraproject.org/fedora:31 -RUN dnf -y install --refresh dnf-plugins-core && dnf -y install docker git python3-setuptools e2fsprogs koji osbs-client\ +FROM registry.fedoraproject.org/fedora:33 +RUN dnf -y install --refresh dnf-plugins-core && dnf -y install moby-engine git python3-setuptools e2fsprogs koji osbs-client\ python3-osbs-client gssproxy fedpkg python3-docker-squash atomic-reactor python3-atomic-reactor* go-md2man python3-productmd\ python3-gobject python3-libmodulemd python3-pdc-client ostree flatpak-module-tools flatpak skopeo && dnf clean all ADD ./orchestrator_customize.json /usr/share/osbs/orchestrator_customize.json