Use ovn2.13-20.12.0-5.bz1839102 scratch build.

Signed-off-by: Dumitru Ceara <dceara@redhat.com> Conflicts: Dockerfile
openshift · Jan 19, 2021 · 8ec6a50 · 8ec6a50
1 parent c079904
commit 8ec6a50
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 0 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -32,6 +32,7 @@ RUN yum install -y  \
 	selinux-policy && \
 	yum clean all
 
+COPY ovn2.13-20.12.0-5.bz1839102.el8fdn.x86_64.rpm ovn2.13-central-20.12.0-5.bz1839102.el8fdn.x86_64.rpm ovn2.13-host-20.12.0-5.bz1839102.el8fdn.x86_64.rpm ovn2.13-vtep-20.12.0-5.bz1839102.el8fdn.x86_64.rpm /root/
 RUN INSTALL_PKGS=" \
 	openssl firewalld-filesystem \
 	libpcap iproute strace \
@@ -44,6 +45,7 @@ RUN INSTALL_PKGS=" \
 	# openvswitch2.13-2.13.0-57.el8fdp
 	yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False "openvswitch2.13 == 2.13.0-57.el8fdp" "openvswitch2.13-devel == 2.13.0-57.el8fdp" && \
 	yum install -y --setopt=tsflags=nodocs --setopt=skip_missing_names_on_install=False "ovn2.13 == 20.06.2-11.el8fdp" "ovn2.13-central == 20.06.2-11.el8fdp" "ovn2.13-host == 20.06.2-11.el8fdp" "ovn2.13-vtep == 20.06.2-11.el8fdp" && \
+	rpm -Uhv --force --nodeps /root/ovn2.13*.rpm && \
 	yum clean all && rm -rf /var/cache/*
 
 RUN mkdir -p /var/run/openvswitch && \

diff --git a/ovn2.13-20.12.0-5.bz1839102.el8fdn.x86_64.rpm b/ovn2.13-20.12.0-5.bz1839102.el8fdn.x86_64.rpm
diff --git a/ovn2.13-central-20.12.0-5.bz1839102.el8fdn.x86_64.rpm b/ovn2.13-central-20.12.0-5.bz1839102.el8fdn.x86_64.rpm
diff --git a/ovn2.13-host-20.12.0-5.bz1839102.el8fdn.x86_64.rpm b/ovn2.13-host-20.12.0-5.bz1839102.el8fdn.x86_64.rpm
diff --git a/ovn2.13-vtep-20.12.0-5.bz1839102.el8fdn.x86_64.rpm b/ovn2.13-vtep-20.12.0-5.bz1839102.el8fdn.x86_64.rpm