diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-19 04:56:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-19 04:56:10 +0000 |
| commit | 747a4789537b053ad3d6630e2ba933c6b2e21fb3 (patch) | |
| tree | 9605d510eac828b02e26cccb6c75c2ec727ba1b9 | |
| parent | 30f2c2af92bae2b7db69efbbd4f8949cbafc5aa4 (diff) | |
| parent | de381efc20d415b4b22f120ee771774d898c255f (diff) | |
| download | kolla-747a4789537b053ad3d6630e2ba933c6b2e21fb3.tar.gz kolla-747a4789537b053ad3d6630e2ba933c6b2e21fb3.zip | |
Merge "dind: get image buildable for Debian"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 3 | ||||
| -rw-r--r-- | docker/dind/Dockerfile.j2 | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b7ab4af08..715557e04 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -362,6 +362,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% set remote_apt_keys = [ 'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key', 'https://bintray.com/user/downloadSubjectPublicKey?username=bintray', + 'https://download.docker.com/linux/debian/gpg' ] %} {% set base_apt_packages = base_apt_packages + ['sudo',] diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index b663bc00d..1f184edd9 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -15,3 +15,6 @@ deb [arch=arm64] https://dl.bintray.com/fg2it/deb-arm64/ stretch main # elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64) deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main + +# main docker repo +deb https://download.docker.com/linux/debian stretch stable diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index 9e6027589..9f70211a1 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -15,10 +15,19 @@ RUN /bin/true {% elif base_distro in ['debian', 'ubuntu'] %} {% set dind_packages = [ 'btrfs-tools', - 'docker.io', 'openssh-server' ] %} + {% if base_distro in ['debian'] %} + {% set dind_packages = dind_packages + [ + 'docker-ce' + ] %} + {% else %} + {% set dind_packages = dind_packages + [ + 'docker.io' + ] %} + {% endif %} + {% if install_type == 'binary' %} {% set dind_packages = dind_packages + [ 'python-setuptools' |