diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-25 20:33:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-25 20:33:54 +0000 |
| commit | e11fff970f0bff6e72ab4a4ffaafc92dbf77b38f (patch) | |
| tree | 97b356a312b5129ca6fe05e27a07f5be978d9639 /docker | |
| parent | df1eb772a1157faca77d4ef571ccc53bd70cf344 (diff) | |
| parent | ffe08baa72048fdaa6c5f24b67721db7178a5928 (diff) | |
| download | kolla-e11fff970f0bff6e72ab4a4ffaafc92dbf77b38f.tar.gz kolla-e11fff970f0bff6e72ab4a4ffaafc92dbf77b38f.zip | |
Merge "docker: do not install pip again in images"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/telegraf/Dockerfile.j2 | 2 |
5 files changed, 0 insertions, 7 deletions
diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index f2024b242..280792784 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -10,13 +10,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set elasticsearch_curator_packages = [ 'cronie', - 'python3-pip', 'python3-wheel' ] %} {% elif base_package_type == 'deb' %} {% set elasticsearch_curator_packages = [ 'cron', - 'python3-pip', 'python3-setuptools', 'python3-wheel' ] %} diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 91b203dab..6e921d39d 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -32,7 +32,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'librados-dev', 'python3-boto3', 'python3-dev', - 'python3-pip', 'python3-rados', 'python3-setuptools', 'python3-wheel' diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index fdaf9107e..e2786e5fb 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -129,7 +129,6 @@ ENV DEBIAN_FRONTEND noninteractive 'python3-openstackclient', 'python3-oslo.log', 'python3-osprofiler', - 'python3-pip', 'python3-psycopg2', 'python3-pymemcache', 'python3-pymysql', diff --git a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 index c4be97405..5c42abb6a 100644 --- a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 @@ -10,7 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block openvswitch_netcontrold_install %} {% set openvswitch_netcontrold_packages = [ - 'python3-pip', ] %} {{ macros.install_packages(openvswitch_netcontrold_packages | customizable("packages")) }} diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index 37816da55..c8632a61c 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -20,12 +20,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set telegraf_packages = telegraf_packages + [ 'collectd', - 'python3-pip' ] %} {% elif base_package_type == 'deb' %} {% set telegraf_packages = telegraf_packages + [ 'collectd-core', - 'python3-pip' ] %} {% endif %} |