aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j23
-rw-r--r--docker/base/apt_preferences.debian20
2 files changed, 22 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index c854f4cdf..baa1169da 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -450,7 +450,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'https://packages.grafana.com/gpg.key',
'http://buster-train.debian.net/debian/dists/pubkey.gpg',
'https://packages.treasuredata.com/GPG-KEY-td-agent',
- 'https://repos.influxdata.com/influxdb.key'
+ 'https://repos.influxdata.com/influxdb.key',
+ 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
] %}
{% set base_apt_packages = base_apt_packages +
['sudo',]
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 859789d32..6f5c1622a 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -7,3 +7,23 @@ Pin-Priority: 1000
Package: smartmontools
Pin: version 7.*
Pin-Priority: 1000
+
+# We do not want packages from this repo
+Package: *
+Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
+Pin-Priority: 100
+
+# Unless it is libvirt (on aarch64)
+Package: *libvirt*
+Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster,b=arm64
+Pin-Priority: 600
+
+# Unless it is kibana (on aarch64)
+Package: kibana
+Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster
+Pin-Priority: 600
+
+# on x86-64 use upstream package for kibana
+Package: kibana
+Pin: release o=elastic,b=amd64
+Pin-Priority: 700