Add socat to base image

We would need socat tool to perform healthchecks on the various containers.

Closes-Bug: #1749227
Change-Id: Ibda77a8d041d894f5efac6578e52b11651bca97f

6 files changed, 8 insertions, 15 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a3678f589..a003bbed4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -218,6 +218,7 @@ RUN yum -y install \
         'lvm2',
         'python',
         'scsi-target-utils',
+        'socat',
         'sudo',
         'which'
 ] %}
@@ -234,6 +235,7 @@ RUN yum -y install \
     'iscsi-initiator-utils',
     'lvm2',
     'scsi-target-utils',
+    'socat',
     'sudo',
     'tar',
     'which'
@@ -293,6 +295,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
    'netbase',
    'open-iscsi',
    'python',
+   'socat',
    'sudo',
    'tgt']
 %}
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2
index 6aaf1a15d..db232e075 100644
--- a/docker/haproxy/Dockerfile.j2
+++ b/docker/haproxy/Dockerfile.j2
@@ -12,8 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% endif %}
 
 {% set haproxy_packages = [
-    'haproxy',
-    'socat'
+    'haproxy'
 ] %}
 {{ macros.install_packages(haproxy_packages | customizable("packages")) }}
 
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index e19cecdad..470e8abb6 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -27,7 +27,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-UcsSdk',
             'qemu-img',
             'shellinabox',
-            'socat',
             'systemd-python',
             'util-linux',
             'xfsprogs',
@@ -52,7 +51,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python-systemd',
             'qemu-utils',
             'shellinabox',
-            'socat',
             'xfsprogs',
         ] %}
     {% endif %}
@@ -68,7 +66,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'psmisc',
             'qemu-img',
             'shellinabox',
-            'socat',
             'util-linux',
             'xfsprogs',
         ] %}
@@ -83,7 +80,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'psmisc',
             'qemu-utils',
             'shellinabox',
-            'socat',
             'xfsprogs',
         ] %}
     {% endif %}
diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2
index 288029944..015e305b7 100644
--- a/docker/keepalived/Dockerfile.j2
+++ b/docker/keepalived/Dockerfile.j2
@@ -8,13 +8,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
     {% set keepalived_packages = [
         'hostname',
-        'keepalived',
-        'socat'
+        'keepalived'
     ] %}
 {% elif base_distro in ['debian', 'ubuntu'] %}
     {% set keepalived_packages = [
-        'keepalived',
-        'socat'
+        'keepalived'
     ] %}
 {% endif %}
 {{ macros.install_packages(keepalived_packages | customizable("packages")) }}
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index e583465f6..86e083d89 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -17,14 +17,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'percona-xtrabackup',
         'pv',
         'rsync',
-        'socat',
         'tar'
     ] %}
 
 {% elif base_distro in ['debian', 'ubuntu'] %}
     {% set mariadb_packages = [
-        'expect',
-        'socat'
+        'expect'
     ] %}
     {% if base_distro == 'debian' %}
         {% set mariadb_packages = mariadb_packages + [
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 0a7c0ad68..6c9f3a816 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -18,8 +18,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% elif base_distro in ['debian', 'ubuntu'] %}
     {% set rabbitmq_packages = [
         'erlang-nox',
-        'logrotate',
-        'socat'
+        'logrotate'
     ] %}
 
     {% if base_distro == 'debian' %}