Hello all,
Yesterday I noticed that the container builds are not properly
"content generator metadata importing" into koji post build in OSBS.
This is because the version of osbs-client on the koji builders got
updated but I forgot to update the buildroot to contain the new
version of atomic-reactor (this all happened right around Flock and I
had to fix a build issue with atomic-reactor and then just forgot).
I would like to make this ansible change, deploy it to the osbs
machines, and trigger a rebuild of the
buildroot container on the osbs nodes.
Thank you,
-AdamM
commit faec00e81d9f178b05238e0b295423a2397245e8
Author: Adam Miller <admiller@xxxxxxxxxx>
Date: Fri Sep 22 14:28:48 2017 +0000
update osbs buildroot container Dockerfile for prod
Signed-off-by: Adam Miller <admiller@xxxxxxxxxx>
diff --git a/files/osbs/buildroot-Dockerfile-production.j2
b/files/osbs/buildroot-Dockerfile-production.j2
index fcc5568..0de835a 100644
--- a/files/osbs/buildroot-Dockerfile-production.j2
+++ b/files/osbs/buildroot-Dockerfile-production.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 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"]
_______________________________________________
infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx
