diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-09 14:02:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-09 14:02:37 +0000 |
| commit | a8ca0788332941803a1e30c25602719e91258bb3 (patch) | |
| tree | 14acd25e6b57cbdc9b439cc3b51c863da4813c11 /docker | |
| parent | f1e236522525361b8db1c05bee2b53b1c2a4dc5e (diff) | |
| parent | bc55918367c48618e5569fe80431df62ca9b02df (diff) | |
| download | kolla-a8ca0788332941803a1e30c25602719e91258bb3.tar.gz kolla-a8ca0788332941803a1e30c25602719e91258bb3.zip | |
Merge "sensu-client: use docker.io on Debian/Ubuntu"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/sources.list.debian | 3 | ||||
| -rw-r--r-- | docker/sensu/sensu-client/Dockerfile.j2 | 10 |
2 files changed, 1 insertions, 12 deletions
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 5be0171b0..561f19d02 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -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 diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2 index e40c39d89..f281ef45d 100644 --- a/docker/sensu/sensu-client/Dockerfile.j2 +++ b/docker/sensu/sensu-client/Dockerfile.j2 @@ -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 |