openstack/kolla-ansible
Code Issues Proposed changes

Merge "Ensure apt-transport-https is available."

Browse Source
This commit is contained in:
Jenkins
2016-07-22 20:52:16 +00:00
committed by Gerrit Code Review
parent d79ca609c5 a7ac46750d
commit 753adbb22d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@@ -186,11 +186,13 @@ RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc
# This will prevent questions from being asked during the install # This will prevent questions from being asked during the install
ENV DEBIAN_FRONTEND noninteractive 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 sources.list.{{ base_distro }} /etc/apt/sources.list
COPY apt_preferences.{{ base_distro }} /etc/apt/preferences COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
{% set base_apt_packages = [ {% set base_apt_packages = [
'ca-certificates',
'curl', 'curl',
'gawk', 'gawk',
'lvm2', 'lvm2',