aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Jeanneret <cjeanner@redhat.com>2019-04-10 15:19:24 +0200
committerCédric Jeanneret <cjeanner@redhat.com>2019-04-10 15:19:24 +0200
commit9616f49964439966ac8689345b52f4cfc0924258 (patch)
treee58c597b90890c260c492a93b05d4b8c4339e7a1
parent473695264fbd4825761fee341d9c086449c36e0f (diff)
downloadkolla-9616f49964439966ac8689345b52f4cfc0924258.tar.gz
kolla-9616f49964439966ac8689345b52f4cfc0924258.zip
Install "procps(-ng)" in the base image
Providing tools like "ps", "pgrep" and related is interesting since it helps debugging a container in some cases. It is also useful for healthchecks in case we want to fetch running service PID and use it in another command, like "lsof". Change-Id: I91b1c407caa6b03ae522e649592300f9eddfc07e
-rw-r--r--docker/base/Dockerfile.j23
-rw-r--r--docker/openstack-base/Dockerfile.j21
2 files changed, 3 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 18212f0bb..c9d18b296 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -223,6 +223,7 @@ RUN {{ macros.install_packages( ['tar', 'yum-utils', 'https://dl.fedoraproject.o
'iscsi-initiator-utils',
'lvm2',
'ncurses',
+ 'procps-ng',
'scsi-target-utils',
'socat',
'sudo',
@@ -251,6 +252,7 @@ RUN {{ macros.install_packages( ['tar', 'yum-utils', 'https://dl.fedoraproject.o
'iscsi-initiator-utils',
'lvm2',
'ncurses',
+ 'procps-ng',
'scsi-target-utils',
'socat',
'sudo',
@@ -311,6 +313,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'lvm2',
'netbase',
'open-iscsi',
+ 'procps',
'python',
'socat',
'sudo',
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index ec72f3efb..edc07e73d 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -20,7 +20,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% if distro_python_version.startswith('3') %}
{% set openstack_base_packages = openstack_base_packages + [
- 'procps-ng',
'python3-PyYAML',
'python3-alembic',
'python3-anyjson',