diff options
| author | Zuul <zuul@review.opendev.org> | 2019-11-07 09:46:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-11-07 09:46:14 +0000 |
| commit | c17812747de00409bc174870ec85477fa28fb4e9 (patch) | |
| tree | b2edca9f937e425e8954a05336bcb7cf5e9c45e7 | |
| parent | 8e712fadd3d7e12163455a74a8076791d925de11 (diff) | |
| parent | 0f320e34ea3e5f1b8dcc188a082071be7a49c1d0 (diff) | |
| download | kolla-c17812747de00409bc174870ec85477fa28fb4e9.tar.gz kolla-c17812747de00409bc174870ec85477fa28fb4e9.zip | |
Merge "get 'apt_*' options of kolla-build.conf working again" into stable/stein
| -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 ebe7a3ae2..1f6356d1c 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -295,10 +295,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 |