From bf20b41e7dea702b693fa98ea27822c8a33a5591 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 17 Oct 2019 03:36:17 -0700 Subject: get 'apt_*' options of kolla-build.conf working again We broke 'apt_sources_list' and 'apt_preferences' options quite a while ago. Turned out that fix is quite simple. This change adds empty sources.list and apt-preferences files which are always added into images. If kolla-build.conf will use any of APT related options then those files will be replaced with provided ones. Change-Id: I7bbdcbd5c60f654a484a872209e0537e3950346c Closes-bug: #1706549 --- docker/base/Dockerfile.j2 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docker/base/Dockerfile.j2') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 170885346..04aeee35a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -315,10 +315,12 @@ COPY sources.list.{{ base_distro }} /etc/apt/sources.list {% else %} COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list {% endif %} +COPY sources.list /etc/apt/sources.list.d/kolla-custom.list {% endblock %} {% block base_ubuntu_package_apt_preferences %} COPY apt_preferences.{{ base_distro }} /etc/apt/preferences +COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% endblock %} {% set base_apt_packages = [ -- cgit v1.2.3