diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-21 19:41:45 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-26 20:01:28 +0200 |
| commit | e0f8cbc50cf7184930a501b0f5452a64f523cd6f (patch) | |
| tree | 1e8f1999a33fc5259eb4a249c16b6f8f4b222d45 /docker/base/Dockerfile.j2 | |
| parent | af17cc180e40cc19fb08fb3186de43d5a6c7d83d (diff) | |
| download | kolla-e0f8cbc50cf7184930a501b0f5452a64f523cd6f.tar.gz kolla-e0f8cbc50cf7184930a501b0f5452a64f523cd6f.zip | |
move to Debian 'bullseye'
Bullseye is now in hard freeze cycle and goes for release.
https://release.debian.org/bullseye/freeze_policy.html
Co-Authored-By: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I543965a2741cebfa759576a4c75669a7bacd4208
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fc55949ee..6c5d9df83 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -328,6 +328,18 @@ COPY sources.list /etc/apt/sources.list.d/kolla-custom.list {% block base_debian_after_sources_list %}{% endblock %} +{# install Debian Openstack repos - they are not mirrored on CI #} +{% if base_distro == 'debian' %} + +RUN apt update \ + && apt install -y --no-install-recommends extrepo \ + && extrepo enable openstack_wallaby \ + && apt purge -y extrepo \ + && apt --purge autoremove -y \ + && apt clean + +{% endif %} + {% block base_ubuntu_package_apt_preferences %} COPY apt_preferences.{{ base_distro }} /etc/apt/preferences COPY apt_preferences /etc/apt/preferences.d/kolla-custom @@ -383,10 +395,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% set remote_apt_keys = [ 'https://download.docker.com/linux/debian/gpg', 'https://packages.grafana.com/gpg.key', - 'http://buster-ussuri.debian.net/debian/dists/pubkey.gpg', 'https://packages.treasuredata.com/GPG-KEY-td-agent', 'https://repos.influxdata.com/influxdb.key', - 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key', ] %} {% endif %} |
