commit f9e3de3a804691fa1e9d82a5b8412ea37e441473 Author: Nicolas Vigier <boklm@torproject.org> Date: Tue Oct 21 16:09:18 2014 +0200 Include username in docker image name This should avoid conflicts on docker images when multiple users build on the same machine. If the RBM_BUILDNAME environment variable is set, we use that instead of the username (this should allow doing multiple builds from the same user). --- projects/docker-image/config | 2 +- rbm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/docker-image/config b/projects/docker-image/config index e8ca26a..82e45c8 100644 --- a/projects/docker-image/config +++ b/projects/docker-image/config @@ -1,6 +1,6 @@ filename: '[% sha256(c("pre")).substr(0, 12) %]' remote_docker: 1 -docker_save_image: 'tor-messenger:[% c("filename") %]' +docker_save_image: 'tor-messenger_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME : ENV.USER ? ENV.USER : c("uid") %]:[% c("filename") %]' pkg_type: build distributions: diff --git a/rbm b/rbm index 4386f7c..b260a88 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 4386f7cd638a1d77f6d6c2f4d354fb48dc8b10e9 +Subproject commit b260a882c8b8d344ac908b50f6977ba56f8788bb