aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorStephen Hindle <shindle@llnw.com>2016-07-22 11:39:55 -0700
committerStephen Hindle <shindle@llnw.com>2016-07-22 12:09:33 -0700
commita7ac46750d99303764e6b02dde9150ba4c0b0043 (patch)
tree6a179753db423f31347fdd98bfb753ad7a281c31 /docker
parent4196603f854f281464c8a8639da541ea32be59fa (diff)
downloadkolla-a7ac46750d99303764e6b02dde9150ba4c0b0043.tar.gz
kolla-a7ac46750d99303764e6b02dde9150ba4c0b0043.zip
Ensure apt-transport-https is available.
apt-transport-https needs to be installed in the base container BEFORE we add the new sources.list TrivialFix Change-Id: If4a6042f02c9b6e6475c211dc02a302cb6352d7c
Diffstat (limited to 'docker')
-rw-r--r--docker/base/Dockerfile.j24
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',