commit 018e60cb56d2ed11b9c30ad3324aaf7ab39df8da
Author: Nicolas Vigier <bo...@torproject.org>
Date: Tue Oct 20 19:22:32 2015 +0200
docker-image: stop using the distributions configuration
Stop using rbm's distributions configuration. This feature will be
removed from rbm. This feature make config lookup 3 or 4 times slower
and is not very useful.
---
projects/docker-image/config | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/projects/docker-image/config b/projects/docker-image/config
index d1fe261..0a11fe4 100644
--- a/projects/docker-image/config
+++ b/projects/docker-image/config
@@ -5,16 +5,7 @@ docker_image_prefix: 'tor-messenger_[% GET ENV.RBM_BUILDNAME ?
ENV.RBM_BUILDNAME
docker_save_image: '[% c("docker_image_prefix") %]:[% c("filename") %]'
pkg_type: build
-distributions:
- - lsb_release:
- id: Ubuntu
- docker_image: 'ubuntu:[% c("lsb_release/codename") %]'
- - lsb_release:
- id: Debian
- docker_image: 'debian:[% c("lsb_release/codename") %]'
- - lsb_release:
- id: Fedora
- docker_image: 'fedora:[% c("lsb_release/release") %]'
+docker_image: '[% c("lsb_release/id").lower %]:[% c("lsb_release/codename") %]'
lsb_release:
id: '[% pc(c("origin_project", { no_distro => 1 }), "lsb_release/id", {
no_distro => 1 }) %]'
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
