diff options
| author | Zuul <zuul@review.opendev.org> | 2019-11-13 21:37:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-11-13 21:37:09 +0000 |
| commit | 414987b15f7d79cf4c51f305589b5b6d2d8fe1b4 (patch) | |
| tree | 7736e482761564f752060b53af1a00827d6bb4a5 /docker/dragonflow | |
| parent | a398310b34d510da1192e59373faffc493ec4189 (diff) | |
| parent | a20fa84e29a1f3e7afb15d008c05f37aa58ee3c0 (diff) | |
| download | kolla-414987b15f7d79cf4c51f305589b5b6d2d8fe1b4.tar.gz kolla-414987b15f7d79cf4c51f305589b5b6d2d8fe1b4.zip | |
Merge "Remove deprecated images"
Diffstat (limited to 'docker/dragonflow')
5 files changed, 0 insertions, 109 deletions
diff --git a/docker/dragonflow/dragonflow-base/Dockerfile.j2 b/docker/dragonflow/dragonflow-base/Dockerfile.j2 deleted file mode 100644 index 108bb86fb..000000000 --- a/docker/dragonflow/dragonflow-base/Dockerfile.j2 +++ /dev/null @@ -1,49 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block dragonflow_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='dragonflow') }} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - -{% if base_package_type == 'rpm' %} - {% set dragonflow_base_packages = [ - 'zeromq-devel' - ] %} - -{% elif base_package_type == 'deb' %} - {% set dragonflow_base_packages = [ - 'libzmq3-dev' - ] %} - -{% endif %} - -{{ macros.install_packages(dragonflow_base_packages | customizable("packages")) }} - -{% set dragonflow_base_pip_packages = [ - '/dragonflow' -] %} - -ADD dragonflow-base-archive /dragonflow-base-source -RUN ln -s dragonflow-base-source/* dragonflow \ - && {{ macros.install_pip(dragonflow_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/dragonflow \ - && cp -r /dragonflow/etc/* /etc/dragonflow/ \ - && chown -R dragonflow: /etc/dragonflow - -{% endif %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_dragonflow_extend_start \ - && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_dragonflow_extend_start - -{% block dragonflow_base_footer %}{% endblock %} diff --git a/docker/dragonflow/dragonflow-base/extend_start.sh b/docker/dragonflow/dragonflow-base/extend_start.sh deleted file mode 100644 index eeb896f78..000000000 --- a/docker/dragonflow/dragonflow-base/extend_start.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# Create log dir for dragonflow logs -LOG_DIR="/var/log/kolla/dragonflow" -if [[ ! -d "${LOG_DIR}" ]]; then - mkdir -p ${LOG_DIR} -fi -if [[ $(stat -c %a ${LOG_DIR}) != "755" ]]; then - chmod 755 ${LOG_DIR} -fi - -. /usr/local/bin/kolla_dragonflow_extend_start diff --git a/docker/dragonflow/dragonflow-controller/Dockerfile.j2 b/docker/dragonflow/dragonflow-controller/Dockerfile.j2 deleted file mode 100644 index 5efaa3115..000000000 --- a/docker/dragonflow/dragonflow-controller/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}dragonflow-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block dragonflow_controller_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -{% block dragonflow_controller_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER dragonflow diff --git a/docker/dragonflow/dragonflow-metadata/Dockerfile.j2 b/docker/dragonflow/dragonflow-metadata/Dockerfile.j2 deleted file mode 100644 index 93f93a724..000000000 --- a/docker/dragonflow/dragonflow-metadata/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}dragonflow-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block dragonflow_metadata_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -{% block dragonflow_metadata_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER dragonflow diff --git a/docker/dragonflow/dragonflow-publisher-service/Dockerfile.j2 b/docker/dragonflow/dragonflow-publisher-service/Dockerfile.j2 deleted file mode 100644 index 8c55ad58e..000000000 --- a/docker/dragonflow/dragonflow-publisher-service/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}dragonflow-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block dragonflow_publisher_service_header %}{% endblock %} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% endif %} - -{% block dragonflow_publisher_service_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER dragonflow |