From a170353b47d359e39f29cd951f73507b07fefb04 Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Thu, 21 May 2020 10:09:10 +0200 Subject: Make Cyborg buildable (again) This is done by removing the dependency on OPAE SDK. Additionally, cursive is no longer tried to be installed again in the agent image as it is already installed in base via regular requirements. Details in reno and the referenced bug report. Change-Id: Ib6a6f38efd9860851e558f13ee3bdedd8bb57903 Closes-bug: #1873744 --- docker/cyborg/cyborg-agent/Dockerfile.j2 | 38 ++++---------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'docker/cyborg') diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2 index c50c5fc9f..6d7fb1a3c 100644 --- a/docker/cyborg/cyborg-agent/Dockerfile.j2 +++ b/docker/cyborg/cyborg-agent/Dockerfile.j2 @@ -10,45 +10,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'pciutils', ] %} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - -{% set cyborg_agent_pip_packages = [ - 'cursive' -] %} - -{% endif %} - {{ macros.install_packages(cyborg_agent_packages | customizable("packages")) }} -RUN {{ macros.install_pip(cyborg_agent_pip_packages | customizable("pip_packages")) }} - -{% if base_package_type == 'rpm' %} - -ENV opae_libs_rpm_url=https://github.com/OPAE/opae-sdk/releases/download/1.1.0-2/opae-libs-1.1.0-2.x86_64.rpm -ENV opae_libs_rpm_sha1sum=3a10f80d64be46bb8d99ba88548646d0e368a06e - -ENV opae_devel_rpm_url=https://github.com/OPAE/opae-sdk/releases/download/1.1.0-2/opae-devel-1.1.0-2.x86_64.rpm -ENV opae_devel_rpm_sha1sum=461356b987b41843f60123d66195620bf1e4e28e +{% if install_type == 'source' %} -RUN curl -sSL -o /tmp/opae-libs.rpm ${opae_libs_rpm_url} \ - && echo "${opae_libs_rpm_sha1sum} /tmp/opae-libs.rpm" | sha1sum -c \ - && curl -sSL -o /tmp/opae-devel.rpm ${opae_devel_rpm_url} \ - && echo "${opae_devel_rpm_sha1sum} /tmp/opae-devel.rpm" | sha1sum -c \ - && dnf -y install /tmp/opae-libs.rpm /tmp/opae-devel.rpm \ - && rm -f /tmp/opae-libs.rpm /tmp/opae-devel.rpm +{% set cyborg_agent_pip_packages = [ ] %} -# NOTE(Bai Yongjun) Required packages are only supported Ubuntu16.04 -# Please check the details:https://github.com/OPAE/opae-sdk/releases/tag/1.1.0-2 -{% elif base_package_type == 'deb' %} - -RUN echo 'No supported packages' \ - && /bin/false +RUN {{ macros.install_pip(cyborg_agent_pip_packages | customizable("pip_packages")) }} {% endif %} + {% block cyborg_agent_footer %}{% endblock %} {% block footer %}{% endblock %} -- cgit v1.2.3