diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 12:00:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 12:00:47 +0000 |
| commit | 632f1774b95dbbc9c96cb46d838665362c75d934 (patch) | |
| tree | 249dd18daf41c089ed3764ddfe3549c56a7a886a /docker/base | |
| parent | a34a7a01a6050f2e0890023df308ca06a815cefe (diff) | |
| parent | f98a8d6287b8260f2d2731118cc40bfffe75b156 (diff) | |
| download | kolla-632f1774b95dbbc9c96cb46d838665362c75d934.tar.gz kolla-632f1774b95dbbc9c96cb46d838665362c75d934.zip | |
Merge "debian: move to stretch"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/apt_preferences.debian | 19 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 34 |
3 files changed, 3 insertions, 52 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index bd3dec754..f0fc38074 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -313,7 +313,7 @@ RUN sed -i \ && ln -s dist-packages /usr/lib/python2.7/site-packages {% endif %} -{# endif for base_distro ubuntu, debian #} +{# endif for base_distro debian, ubuntu #} {% endif %} COPY set_configs.py /usr/local/bin/kolla_set_configs diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 65b9de467..e69de29bb 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -1,19 +0,0 @@ -Package: * -Pin: origin "nyc2.mirrors.digitalocean.com" -Pin-Priority: 500 - -Package: python-rtslib -Pin: release o=Debian,a=testing,n=stretch,l=Debian -Pin-Priority: 500 - -Package: targetcli -Pin: release o=Debian,a=testing,n=stretch,l=Debian -Pin-Priority: 500 - -Package: python-configshell -Pin: release o=Debian,a=testing,n=stretch,l=Debian -Pin-Priority: 500 - -Package: * -Pin: release o=Debian,a=testing,n=stretch,l=Debian -Pin-Priority: -1 diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index f1195c943..19b16d5fb 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -1,35 +1,5 @@ # Default repos -deb http://httpredir.debian.org/debian jessie main - -# jessie-backports -deb http://httpredir.debian.org/debian jessie-backports main contrib - -# jessie-updates, previously known as 'volatile' -deb http://httpredir.debian.org/debian jessie-updates main +deb http://deb.debian.org/debian stretch main # debian security updates -deb http://security.debian.org jessie/updates main - -# need some packages from testing not available in stable -deb http://httpredir.debian.org/debian stretch main - -# Ceph repo -deb http://download.ceph.com/debian-jewel/ jessie main - -# Maria DB repo -deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/debian jessie main - -# Kibana repo -deb https://packages.elastic.co/kibana/4.6/debian stable main - -# docker -deb http://apt.dockerproject.org/repo debian-jessie main - -# InfluxDB repo -deb https://repos.influxdata.com/debian jessie stable - -# Grafana repo -deb https://packagecloud.io/grafana/stable/debian/ jessie main - -# Fluentd repo -deb http://packages.treasuredata.com/2/debian/jessie/ jessie contrib +deb http://security.debian.org stretch/updates main |