diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-26 10:51:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-26 10:51:27 +0000 |
| commit | 2180a7f31833d713bd4172c2e1c1c4fbf07da99f (patch) | |
| tree | 80b219fcb0e2ab28414a1b32cf11e9209d3076cd | |
| parent | 124f3ec45b1dd2ed853716cec722e62052e17f66 (diff) | |
| parent | f782157245eb15d92a1660146c3cf34227970946 (diff) | |
| download | kolla-2180a7f31833d713bd4172c2e1c1c4fbf07da99f.tar.gz kolla-2180a7f31833d713bd4172c2e1c1c4fbf07da99f.zip | |
Merge "base: drop Linaro OBS key for CentOS and Ubuntu"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 655f688cb..2af50509f 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -97,7 +97,6 @@ COPY dnf.conf /etc/dnf/dnf.conf {% set base_yum_repo_keys = [ 'https://packages.grafana.com/gpg.key', 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', - 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/centos7/repodata/repomd.xml.key', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. # @@ -356,11 +355,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'https://packages.grafana.com/gpg.key', 'https://repos.influxdata.com/influxdb.key', ] %} - {% if base_arch == 'aarch64' %} - {% set remote_apt_keys = remote_apt_keys + [ - 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic/Release.key', - ] %} - {% endif %} {% elif base_distro == 'debian' %} {% set base_apt_keys = [ '46095ACC8548582C1A2699A9D27D666CD88E42B4', @@ -374,11 +368,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key', 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', ] %} - {% if base_arch == 'aarch64' %} - {% set remote_apt_keys = remote_apt_keys + [ - 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key', - ] %} - {% endif %} {% set base_apt_packages = base_apt_packages + ['sudo',] %} |