openstack
/
kolla
Code Issues Proposed changes

Merge "debian: switch to Train binary packages"

This commit is contained in:
Zuul 2019-10-02 10:43:15 +00:00 committed by Gerrit Code Review
parent 121503e589 dcd93070df
commit ac3269c080
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -364,7 +364,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
{% set remote_apt_keys = [
'https://download.docker.com/linux/debian/gpg',
'https://packages.grafana.com/gpg.key',
'http://buster-stein.debian.net/debian/dists/pubkey.gpg',
'http://buster-train.debian.net/debian/dists/pubkey.gpg',
'https://packages.treasuredata.com/GPG-KEY-td-agent',
] %}
{% set base_apt_packages = base_apt_packages +

6
docker/base/sources.list.debian
View File

@ -13,9 +13,9 @@ deb https://download.docker.com/linux/debian buster stable
# Grafana repo
deb https://packages.grafana.com/oss/deb stable main
# Buster - Stein repos
deb http://buster-stein.debian.net/debian buster-stein-backports main
deb http://buster-stein.debian.net/debian buster-stein-backports-nochange main
# Buster - Train repos
deb http://buster-train.debian.net/debian buster-train-backports main
deb http://buster-train.debian.net/debian buster-train-backports-nochange main
# td-agent for fluentd
deb http://packages.treasuredata.com/3/debian/stretch stretch contrib