cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [2/2] git commit: updated refs/heads/master to f279840
Date Fri, 09 Dec 2016 08:04:46 GMT
Merge pull request #1815 from pdion891/dockerfile4.10.0

Fix docker image build for cloudstack-managementCLOUDSTACK-9651

Fix Docker images build for 4.10.0.0:
- simulator
- marvin
- management_centos6

Squashed version of #1435.

* pr/1815:
  CLOUDSTACK-9651; fix docker image build for cloudstack-management, simulator and marvin
for 4.10.0.0 close #1435

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2798403
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2798403
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2798403

Branch: refs/heads/master
Commit: f2798403b58c26ef26227a26485e9266e7ef84c5
Parents: fac8c5f f88a108
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri Dec 9 13:34:27 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Dec 9 13:34:27 2016 +0530

----------------------------------------------------------------------
 tools/build/build_asf.sh        |  4 +++-
 tools/build/setnextversion.sh   | 10 ++++++++++
 tools/docker/Dockerfile         | 11 +++++++----
 tools/docker/Dockerfile.centos6 | 10 ++++++----
 tools/docker/Dockerfile.marvin  |  8 +++++---
 tools/docker/README.md          |  2 +-
 6 files changed, 32 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2798403/tools/build/build_asf.sh
----------------------------------------------------------------------
diff --cc tools/build/build_asf.sh
index 75eac69,a8c4083..6da0b5d
--- a/tools/build/build_asf.sh
+++ b/tools/build/build_asf.sh
@@@ -90,14 -90,12 +90,13 @@@ export currentversion=`mvn org.apache.m
  echo "found $currentversion"
  
  echo 'setting version numbers'
 -mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator -P
baremetal -P ucs -Dnoredist
 +
 +mvn versions:set -DnewVersion=$version -P developer,systemvm -Dnoredist -Dsimulator
 +mvn versions:set -DnewVersion=$version -pl tools/checkstyle
  mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml
  perl -pi -e "s/<cs.xapi.version>6.2.0-1-SNAPSHOT<\/cs.xapi.version>/<cs.xapi.version>6.2.0-1<\/cs.xapi.version>/"
pom.xml
 -perl -pi -e "s/-SNAPSHOT//" tools/checkstyle/pom.xml
  perl -pi -e "s/-SNAPSHOT//" deps/XenServerJava/pom.xml
  perl -pi -e "s/-SNAPSHOT//" tools/apidoc/pom.xml
- perl -pi -e "s/-SNAPSHOT//" Dockerfile
  perl -pi -e "s/-SNAPSHOT//" build/replace.properties
  perl -pi -e "s/-SNAPSHOT//" services/console-proxy/plugin/pom.xml
  perl -pi -e "s/-SNAPSHOT//" tools/marvin/setup.py


Mime
View raw message