diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-11 09:39:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-11 09:39:28 +0000 |
| commit | 657820362dd0b52f8462054e043fd892d14fbe76 (patch) | |
| tree | d2675f8f172c08febc6f1eaf9900deec7b43c8ee /docker/cyborg | |
| parent | 26fd382f176adbc104850f565df238253d8f9fc7 (diff) | |
| parent | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff) | |
| download | kolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip | |
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/cyborg')
| -rw-r--r-- | docker/cyborg/cyborg-api/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 9 |
2 files changed, 2 insertions, 19 deletions
diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index e071f7a73..2863de3d6 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -6,17 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block cyborg_api_header %}{% endblock %} {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - - {% set cyborg_api_packages = [ - ] %} +{% set cyborg_api_packages = [ +] %} {{ macros.install_packages(cyborg_api_packages | customizable("packages")) }} -{% endif %} COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start RUN chmod 755 /usr/local/bin/kolla_cyborg_extend_start diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index 9d60c7ab1..1373cb9b2 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -9,13 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='cyborg') }} -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - ADD cyborg-base-archive /cyborg-base-source {% set cyborg_base_pip_packages = [ @@ -27,8 +20,6 @@ RUN ln -s cyborg-base-source/* cyborg \ && mkdir -p /etc/cyborg/ \ && cp -r /cyborg/etc/cyborg/* /etc/cyborg/ -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY cyborg_sudoers /etc/sudoers.d/kolla_cyborg_sudoers |