docker: do not install pip again in images
We install pip in base image so why repeat? Change-Id: Id903880b121d87d75b7b14084b0961b9ce99deba
This commit is contained in:
parent
1d4bfd3e90
commit
ffe08baa72
@ -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'
|
||||
] %}
|
||||
|
@ -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'
|
||||
|
@ -129,7 +129,6 @@ ENV DEBIAN_FRONTEND noninteractive
|
||||
'python3-openstackclient',
|
||||
'python3-oslo.log',
|
||||
'python3-osprofiler',
|
||||
'python3-pip',
|
||||
'python3-psycopg2',
|
||||
'python3-pymemcache',
|
||||
'python3-pymysql',
|
||||
|
@ -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")) }}
|
||||
|
@ -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…
Reference in New Issue
Block a user