diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-27 16:36:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-27 16:36:49 +0000 |
| commit | 834ffd912a130c552cbe1ff9a416dea95599a3e4 (patch) | |
| tree | 48df00a4a1b08e669143fa914dd59ef28bf405fa /docker | |
| parent | 6d223d3005bab377339f2d91e53458f1037c4bf9 (diff) | |
| parent | a170353b47d359e39f29cd951f73507b07fefb04 (diff) | |
| download | kolla-834ffd912a130c552cbe1ff9a416dea95599a3e4.tar.gz kolla-834ffd912a130c552cbe1ff9a416dea95599a3e4.zip | |
Merge "Make Cyborg buildable (again)"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cyborg/cyborg-agent/Dockerfile.j2 | 38 |
1 files changed, 4 insertions, 34 deletions
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 %} |