You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/10 11:22:27 UTC
[2/2] git commit: updated refs/heads/master to 752cf11
Merge pull request #999 from pdion891/dockerfile7
squashed commit for dockerfiles part#2 including comments from PR#910This PR replace PR#910 which include fix from comments in PR#910.
This PR simplify download of systemvm templates, work with docker-compose and enable integration-api port and use of localstorage without reconfiguration of cloudstack.
Rebased on Oct28.
* pr/999:
squashed commit for dockerfiles part#2 including comments from PR#910
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/752cf119
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/752cf119
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/752cf119
Branch: refs/heads/master
Commit: 752cf119f2196f026ebdcde932a853b2a47f9357
Parents: 04f7208 fb2e5d2
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Nov 10 11:21:31 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Nov 10 11:21:32 2015 +0100
----------------------------------------------------------------------
tools/docker/Dockerfile | 3 +-
tools/docker/Dockerfile.centos6 | 8 +++--
tools/docker/README.md | 1 +
tools/docker/init.sh_centos6 | 45 +++++++++++++++++++++---
tools/docker/systemtpl.sh | 66 ++++++++++++++++++++++++++++++++++++
5 files changed, 116 insertions(+), 7 deletions(-)
----------------------------------------------------------------------