aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-01-10 16:45:13 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-01-10 15:57:15 +0000
commitad03d7eaa25c31b201ec1c7dc2596f67bbe4fdaf (patch)
treebd8191ef056d9fe5c4af71671d61489fd52609e0 /docker/base
parent2cf3f2309a2a774f65d403b90d1950cab001863f (diff)
downloadkolla-ad03d7eaa25c31b201ec1c7dc2596f67bbe4fdaf.tar.gz
kolla-ad03d7eaa25c31b201ec1c7dc2596f67bbe4fdaf.zip
CI: use Debian/Ubuntu mirrors in base image
So far we built 'base' image using upstream mirrors and then replaced them with OpenStack infra ones. Let do that right after we copy own APT sources.list file. Change-Id: Icb745f628c1c50d9f20df022b08ddc46fccc270c
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 48522109d..24dd20a1e 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -308,6 +308,8 @@ COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list
COPY sources.list /etc/apt/sources.list.d/kolla-custom.list
{% endblock %}
+{% block base_debian_after_sources_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