Add socat to base image
We would need socat tool to perform healthchecks on the various containers. Closes-Bug: #1749227 Change-Id: Ibda77a8d041d894f5efac6578e52b11651bca97f
This commit is contained in:
parent
9735112313
commit
293a1d9f8c
@ -218,6 +218,7 @@ RUN yum -y install \
|
|||||||
'lvm2',
|
'lvm2',
|
||||||
'python',
|
'python',
|
||||||
'scsi-target-utils',
|
'scsi-target-utils',
|
||||||
|
'socat',
|
||||||
'sudo',
|
'sudo',
|
||||||
'which'
|
'which'
|
||||||
] %}
|
] %}
|
||||||
@ -234,6 +235,7 @@ RUN yum -y install \
|
|||||||
'iscsi-initiator-utils',
|
'iscsi-initiator-utils',
|
||||||
'lvm2',
|
'lvm2',
|
||||||
'scsi-target-utils',
|
'scsi-target-utils',
|
||||||
|
'socat',
|
||||||
'sudo',
|
'sudo',
|
||||||
'tar',
|
'tar',
|
||||||
'which'
|
'which'
|
||||||
@ -293,6 +295,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
|
|||||||
'netbase',
|
'netbase',
|
||||||
'open-iscsi',
|
'open-iscsi',
|
||||||
'python',
|
'python',
|
||||||
|
'socat',
|
||||||
'sudo',
|
'sudo',
|
||||||
'tgt']
|
'tgt']
|
||||||
%}
|
%}
|
||||||
|
@ -12,8 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% set haproxy_packages = [
|
{% set haproxy_packages = [
|
||||||
'haproxy',
|
'haproxy'
|
||||||
'socat'
|
|
||||||
] %}
|
] %}
|
||||||
{{ macros.install_packages(haproxy_packages | customizable("packages")) }}
|
{{ macros.install_packages(haproxy_packages | customizable("packages")) }}
|
||||||
|
|
||||||
|
@ -27,7 +27,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
'python-UcsSdk',
|
'python-UcsSdk',
|
||||||
'qemu-img',
|
'qemu-img',
|
||||||
'shellinabox',
|
'shellinabox',
|
||||||
'socat',
|
|
||||||
'systemd-python',
|
'systemd-python',
|
||||||
'util-linux',
|
'util-linux',
|
||||||
'xfsprogs',
|
'xfsprogs',
|
||||||
@ -52,7 +51,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
'python-systemd',
|
'python-systemd',
|
||||||
'qemu-utils',
|
'qemu-utils',
|
||||||
'shellinabox',
|
'shellinabox',
|
||||||
'socat',
|
|
||||||
'xfsprogs',
|
'xfsprogs',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -68,7 +66,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
'psmisc',
|
'psmisc',
|
||||||
'qemu-img',
|
'qemu-img',
|
||||||
'shellinabox',
|
'shellinabox',
|
||||||
'socat',
|
|
||||||
'util-linux',
|
'util-linux',
|
||||||
'xfsprogs',
|
'xfsprogs',
|
||||||
] %}
|
] %}
|
||||||
@ -83,7 +80,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
'psmisc',
|
'psmisc',
|
||||||
'qemu-utils',
|
'qemu-utils',
|
||||||
'shellinabox',
|
'shellinabox',
|
||||||
'socat',
|
|
||||||
'xfsprogs',
|
'xfsprogs',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -8,13 +8,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
||||||
{% set keepalived_packages = [
|
{% set keepalived_packages = [
|
||||||
'hostname',
|
'hostname',
|
||||||
'keepalived',
|
'keepalived'
|
||||||
'socat'
|
|
||||||
] %}
|
] %}
|
||||||
{% elif base_distro in ['debian', 'ubuntu'] %}
|
{% elif base_distro in ['debian', 'ubuntu'] %}
|
||||||
{% set keepalived_packages = [
|
{% set keepalived_packages = [
|
||||||
'keepalived',
|
'keepalived'
|
||||||
'socat'
|
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ macros.install_packages(keepalived_packages | customizable("packages")) }}
|
{{ macros.install_packages(keepalived_packages | customizable("packages")) }}
|
||||||
|
@ -17,14 +17,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
'percona-xtrabackup',
|
'percona-xtrabackup',
|
||||||
'pv',
|
'pv',
|
||||||
'rsync',
|
'rsync',
|
||||||
'socat',
|
|
||||||
'tar'
|
'tar'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% elif base_distro in ['debian', 'ubuntu'] %}
|
{% elif base_distro in ['debian', 'ubuntu'] %}
|
||||||
{% set mariadb_packages = [
|
{% set mariadb_packages = [
|
||||||
'expect',
|
'expect'
|
||||||
'socat'
|
|
||||||
] %}
|
] %}
|
||||||
{% if base_distro == 'debian' %}
|
{% if base_distro == 'debian' %}
|
||||||
{% set mariadb_packages = mariadb_packages + [
|
{% set mariadb_packages = mariadb_packages + [
|
||||||
|
@ -18,8 +18,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
{% elif base_distro in ['debian', 'ubuntu'] %}
|
{% elif base_distro in ['debian', 'ubuntu'] %}
|
||||||
{% set rabbitmq_packages = [
|
{% set rabbitmq_packages = [
|
||||||
'erlang-nox',
|
'erlang-nox',
|
||||||
'logrotate',
|
'logrotate'
|
||||||
'socat'
|
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{% if base_distro == 'debian' %}
|
{% if base_distro == 'debian' %}
|
||||||
|
Loading…
Reference in New Issue
Block a user