diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-12-04 20:34:35 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-12-04 20:35:49 +0100 |
| commit | bc55918367c48618e5569fe80431df62ca9b02df (patch) | |
| tree | 53c9951950de287b66170eb451b82d74942ca60a | |
| parent | fb74313d7df98aabaa2fd3f8fb606110aa042d27 (diff) | |
| download | kolla-bc55918367c48618e5569fe80431df62ca9b02df.tar.gz kolla-bc55918367c48618e5569fe80431df62ca9b02df.zip | |
sensu-client: use docker.io on Debian/Ubuntu
There is no need to use external Docker repo for an image which just
needs Docker client.
Change-Id: I61387287eb3d144ba1686d95b38f95c8292f5b0d
| -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 |