diff options
| author | Zuul <zuul@review.opendev.org> | 2019-10-24 18:58:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-10-24 18:58:03 +0000 |
| commit | 2e908723ac0ae1bf066a7c53a2bfd219fd3df475 (patch) | |
| tree | 63ce2a836a2faf9c168b8ddd03eda3ab218a34ad | |
| parent | e3764ac72c5874baee26336ae277cde7bdceef93 (diff) | |
| parent | bf20b41e7dea702b693fa98ea27822c8a33a5591 (diff) | |
| download | kolla-2e908723ac0ae1bf066a7c53a2bfd219fd3df475.tar.gz kolla-2e908723ac0ae1bf066a7c53a2bfd219fd3df475.zip | |
Merge "get 'apt_*' options of kolla-build.conf working again"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/apt_preferences | 1 | ||||
| -rw-r--r-- | docker/base/sources.list | 1 |
3 files changed, 4 insertions, 0 deletions
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 = [ diff --git a/docker/base/apt_preferences b/docker/base/apt_preferences new file mode 100644 index 000000000..dc5b993f1 --- /dev/null +++ b/docker/base/apt_preferences @@ -0,0 +1 @@ +# used for adding custom options by 'apt_preferences' option of kolla-build.conf diff --git a/docker/base/sources.list b/docker/base/sources.list new file mode 100644 index 000000000..1acbbcb59 --- /dev/null +++ b/docker/base/sources.list @@ -0,0 +1 @@ +# used for adding custom repos by 'apt_sources_list' option of kolla-build.conf |