You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pd...@apache.org on 2015/09/29 15:00:18 UTC
git commit: updated refs/heads/4.5 to f1f1fef
Repository: cloudstack
Updated Branches:
refs/heads/4.5 bab993864 -> f1f1fefdf
Fix dockerbuild because hardcoded filename for marvin
Signed-off-by: Pierre-Luc Dion <pd...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1f1fefd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1f1fefd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1f1fefd
Branch: refs/heads/4.5
Commit: f1f1fefdf6c3e0eba812b6b5d9321b3aaf1711a6
Parents: bab9938
Author: Pierre-Luc Dion <pd...@apache.org>
Authored: Sun Sep 27 20:53:34 2015 -0400
Committer: Pierre-Luc Dion <pd...@apache.org>
Committed: Tue Sep 29 08:59:53 2015 -0400
----------------------------------------------------------------------
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1f1fefd/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 32e2c74..a1ff652 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,8 @@ RUN (/usr/bin/mysqld_safe &); \
sleep 3; \
mvn -Pdeveloper -pl developer -Ddeploydb; \
mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
- pip install tools/marvin/dist/Marvin-4.5.2.tar.gz
+ MARVIN_FILE=`find tools/marvin/dist/ -name "Marvin*.tar.gz"` \
+ pip install $MARVIN_FILE
EXPOSE 8080