diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-22 20:52:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-22 20:52:16 +0000 |
| commit | 753adbb22d0ad0e8652aeeb4d4599ab7ff03eea1 (patch) | |
| tree | 8c1017843d451344ac871dfb0a28bc700c43d3b1 /docker | |
| parent | d79ca609c5e58b2d56cd617e48314a73c41ad6f9 (diff) | |
| parent | a7ac46750d99303764e6b02dde9150ba4c0b0043 (diff) | |
| download | kolla-753adbb22d0ad0e8652aeeb4d4599ab7ff03eea1.tar.gz kolla-753adbb22d0ad0e8652aeeb4d4599ab7ff03eea1.zip | |
Merge "Ensure apt-transport-https is available."
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 98461a851..8e7e600ef 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -186,11 +186,13 @@ RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc # This will prevent questions from being asked during the install ENV DEBIAN_FRONTEND noninteractive +# Need apt-transport-https BEFORE we replace sources.list or apt-get update wont work! +RUN apt-get update && apt-get -y install --no-install-recommends apt-transport-https ca-certificates + COPY sources.list.{{ base_distro }} /etc/apt/sources.list COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% set base_apt_packages = [ - 'ca-certificates', 'curl', 'gawk', 'lvm2', |