diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/macros.j2 | 5 | ||||
| -rw-r--r-- | docker/monasca/monasca-thresh/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/ovsdpdk/ovsdpdk/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/skydive/skydive-base/Dockerfile.j2 | 2 |
7 files changed, 10 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 55a2e1829..799847183 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -24,8 +24,6 @@ LABEL kolla_version="{{ kolla_version }}" {% block base_header %}{% endblock %} ENV KOLLA_BASE_DISTRO={{ base_distro }} \ - KOLLA_INSTALL_TYPE={{ install_type }} \ - KOLLA_INSTALL_METATYPE={{ install_metatype }} \ KOLLA_DISTRO_PYTHON_VERSION={{ distro_python_version }} \ KOLLA_BASE_ARCH={{ base_arch }} diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 9f89f3ff8..36ad4f3fa 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -10,6 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.add_binary_source_envs() }} {{ macros.configure_user(name='ansible') }} {{ macros.configure_user(name='rabbitmq') }} diff --git a/docker/macros.j2 b/docker/macros.j2 index 56dd1414a..7076e422c 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -80,3 +80,8 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \ {{ handle_repos(repos, 'disable') }} {% endmacro %} + +{% macro add_binary_source_envs() %} +ENV KOLLA_INSTALL_TYPE={{ install_type }} \ + KOLLA_INSTALL_METATYPE={{ install_metatype }} +{% endmacro %} diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index 1741cd6a5..2c9200fba 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -9,6 +9,7 @@ USER root {% import "macros.j2" as macros with context %} +{{ macros.add_binary_source_envs() }} {{ macros.configure_user(name='monasca') }} {% if install_type == 'binary' %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 48d4629ba..399be3245 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} +{{ macros.add_binary_source_envs() }} {{ macros.enable_extra_repos(['opstools']) }} {% if install_type == 'binary' %} diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 index 48ba0ccf7..45bb2435c 100644 --- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 +++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 @@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build #TODO(sean-k-mooney) create repo via open suse build system to package # for centos/rhel distros. -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ +RUN echo 'image not yet available for {{ base_distro }}' \ && /bin/false {% elif base_package_type == 'deb' %} diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index 176a10b90..b2353142e 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block skydive_install %} {% if base_arch != 'x86_64' %} -RUN echo '{{ install_type }} on {{ base_distro }} not yet available on non x86_64 platforms' \ +RUN echo 'image on {{ base_distro }} is not yet available on non x86_64 platforms' \ && /bin/false {% else %} RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.26.0/skydive" \ |