diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-01-25 18:19:54 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-01-25 18:20:40 +0100 |
| commit | f782157245eb15d92a1660146c3cf34227970946 (patch) | |
| tree | a3257c0655f3fec714c12e436462e0f544d1dca3 /docker/base | |
| parent | dcdb04fd3a2204de43653fb5cb35c80ca1421e60 (diff) | |
| download | kolla-f782157245eb15d92a1660146c3cf34227970946.tar.gz kolla-f782157245eb15d92a1660146c3cf34227970946.zip | |
base: drop Linaro OBS key for CentOS and Ubuntu
Debian still needs it but it is enabled for all architectures.
Change-Id: I6a3ba599af3deedd450b4ffff6b86a0c04628340
Diffstat (limited to 'docker/base')
| -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',] %} |