Merge "sensu-client: use docker.io on Debian/Ubuntu"

This commit is contained in:
Zuul 2019-12-09 14:02:36 +00:00 committed by Gerrit Code Review
commit a8ca078833
2 changed files with 1 additions and 12 deletions

View File

@ -4,9 +4,6 @@ deb http://deb.debian.org/debian buster main
# debian security updates
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
deb http://buster-train.debian.net/debian buster-train-backports main
deb http://buster-train.debian.net/debian buster-train-backports-nochange main

View File

@ -32,6 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set sensu_client_packages = [
'build-essential',
'ceph-common',
'docker.io',
'inetutils-ping',
'libsasl2-dev',
'mysql-client',
@ -41,15 +42,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-rados',
'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 %}
RUN echo '{{ image_name }} not yet available for {{ base_distro }}' \
&& /bin/false