Browse Source

docker: do not install pip again in images

We install pip in base image so why repeat?

Change-Id: Id903880b121d87d75b7b14084b0961b9ce99deba
changes/66/772366/1
Marcin Juszkiewicz 1 year ago
parent
commit
ffe08baa72
  1. 2
      docker/elasticsearch/elasticsearch-curator/Dockerfile.j2
  2. 1
      docker/gnocchi/gnocchi-base/Dockerfile.j2
  3. 1
      docker/openstack-base/Dockerfile.j2
  4. 1
      docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2
  5. 2
      docker/telegraf/Dockerfile.j2

2
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'
] %}

1
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'

1
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',

1
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")) }}

2
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 %}

Loading…
Cancel
Save