diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-13 10:15:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-13 10:15:38 +0000 |
| commit | 0811df6ac03f3abe2f347f30ce8d1316b43a944f (patch) | |
| tree | cb299858dadcdbeb9f482365b3c0986cdc893f88 /docker | |
| parent | fc572d1cda56de637c683871657c317321db2ce3 (diff) | |
| parent | ad03d7eaa25c31b201ec1c7dc2596f67bbe4fdaf (diff) | |
| download | kolla-0811df6ac03f3abe2f347f30ce8d1316b43a944f.tar.gz kolla-0811df6ac03f3abe2f347f30ce8d1316b43a944f.zip | |
Merge "CI: use Debian/Ubuntu mirrors in base image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3001028fa..2f42ab7db 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -312,6 +312,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 |