From 9616f49964439966ac8689345b52f4cfc0924258 Mon Sep 17 00:00:00 2001
From: Cédric Jeanneret <cjeanner@redhat.com>
Date: Wed, 10 Apr 2019 15:19:24 +0200
Subject: 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
---
 docker/base/Dockerfile.j2           | 3 +++
 docker/openstack-base/Dockerfile.j2 | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'docker')

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',
-- 
cgit v1.2.3