diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2019-10-17 03:36:17 -0700 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-11-05 12:20:02 +0000 |
| commit | 0f320e34ea3e5f1b8dcc188a082071be7a49c1d0 (patch) | |
| tree | bfd98fb95baa3065f442d6decf15ebfc242b8668 /docker | |
| parent | 77028db9077a7162f698aec388f7489778c3398e (diff) | |
| download | kolla-0f320e34ea3e5f1b8dcc188a082071be7a49c1d0.tar.gz kolla-0f320e34ea3e5f1b8dcc188a082071be7a49c1d0.zip | |
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
(cherry picked from commit bf20b41e7dea702b693fa98ea27822c8a33a5591)
Diffstat (limited to 'docker')
| -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 |