Merge branch 'minimise-docker-images'
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/78680bc5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/78680bc5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/78680bc5 Branch: refs/heads/master Commit: 78680bc5cc0902608a2c0293537bffeb2511a64c Parents: 89fab31 db006e4 Author: Chris Snow <[email protected]> Authored: Tue Sep 2 07:22:32 2014 +0000 Committer: Chris Snow <[email protected]> Committed: Tue Sep 2 07:25:13 2014 +0000 ---------------------------------------------------------------------- .../puppetmaster/Dockerfile | 6 +--- tools/stratos-docker-images/stratos/Dockerfile | 26 ++++++---------- .../stratos/docker-build.sh | 31 +++++++++++++++++++- 3 files changed, 40 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
