Merge "sensu-client: use docker.io on Debian/Ubuntu"
This commit is contained in:
commit
a8ca078833
|
@ -4,9 +4,6 @@ deb http://deb.debian.org/debian buster main
|
||||||
# debian security updates
|
# debian security updates
|
||||||
deb http://security.debian.org/debian-security buster/updates main
|
deb http://security.debian.org/debian-security buster/updates main
|
||||||
|
|
||||||
# main docker repo
|
|
||||||
deb https://download.docker.com/linux/debian buster stable
|
|
||||||
|
|
||||||
# Buster - Train repos
|
# Buster - Train repos
|
||||||
deb http://buster-train.debian.net/debian buster-train-backports main
|
deb http://buster-train.debian.net/debian buster-train-backports main
|
||||||
deb http://buster-train.debian.net/debian buster-train-backports-nochange main
|
deb http://buster-train.debian.net/debian buster-train-backports-nochange main
|
||||||
|
|
|
@ -32,6 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% set sensu_client_packages = [
|
{% set sensu_client_packages = [
|
||||||
'build-essential',
|
'build-essential',
|
||||||
'ceph-common',
|
'ceph-common',
|
||||||
|
'docker.io',
|
||||||
'inetutils-ping',
|
'inetutils-ping',
|
||||||
'libsasl2-dev',
|
'libsasl2-dev',
|
||||||
'mysql-client',
|
'mysql-client',
|
||||||
|
@ -41,15 +42,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'python3-rados',
|
'python3-rados',
|
||||||
'python3-rbd'
|
'python3-rbd'
|
||||||
] %}
|
] %}
|
||||||
{% if base_distro in ['debian'] %}
|
|
||||||
{% set sensu_client_packages = sensu_client_packages + [
|
|
||||||
'docker-ce'
|
|
||||||
] %}
|
|
||||||
{% else %}
|
|
||||||
{% set sensu_client_packages = sensu_client_packages + [
|
|
||||||
'docker.io'
|
|
||||||
] %}
|
|
||||||
{% endif %}
|
|
||||||
{% else %}
|
{% else %}
|
||||||
RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
|
RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
|
||||||
&& /bin/false
|
&& /bin/false
|
||||||
|
|
Loading…
Reference in New Issue