Skip to content

Commit f279840

Browse files
yadvryadvr
committed
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>
2 parents fac8c5f + f88a108 commit f279840

6 files changed

Lines changed: 32 additions & 13 deletions

File tree

‎tools/build/build_asf.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,16 @@ mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml
9797
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
9898
perl -pi -e "s/-SNAPSHOT//" deps/XenServerJava/pom.xml
9999
perl -pi -e "s/-SNAPSHOT//" tools/apidoc/pom.xml
100-
perl -pi -e "s/-SNAPSHOT//" Dockerfile
101100
perl -pi -e "s/-SNAPSHOT//" build/replace.properties
102101
perl -pi -e "s/-SNAPSHOT//" services/console-proxy/plugin/pom.xml
103102
perl -pi -e "s/-SNAPSHOT//" tools/marvin/setup.py
104103
perl -pi -e "s/-SNAPSHOT//" tools/marvin/marvin/deployAndRun.py
105104
perl -pi -e "s/-SNAPSHOT//" services/iam/plugin/pom.xml
106105
perl -pi -e "s/-SNAPSHOT//" services/iam/pom.xm
107106
perl -pi -e "s/-SNAPSHOT//" services/iam/server/pom.xml
107+
perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile
108+
perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile.marvin
109+
perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile.centos6
108110

109111
case "$currentversion" in
110112
*-SNAPSHOT*)

‎tools/build/setnextversion.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,16 @@ perl -pi -e "s/$currentversion/$version/" services/iam/pom.xm
7373
perl -pi -e "s/$currentversion/$version/" services/iam/server/pom.xml
7474
perl -pi -e "s/$currentversion/$version/" tools/checkstyle/pom.xml
7575
perl -pi -e "s/$currentversion/$version/" services/console-proxy/plugin/pom.xml
76+
# Dockerfiles
77+
perl -pi -e "s/Version=\"$currentversion\"/Version=\"$version\"/" tools/docker/Dockerfile
78+
perl -pi -e "s/Version=\"$currentversion\"/Version=\"$version\"/" tools/docker/Dockerfile.marvin
79+
# centos6 based dockerfile
80+
perl -pi -e "s/Version=\"$currentversion\"/Version=\"$version\"/" tools/docker/Dockerfile.centos6
81+
perl -pi -e "s/cloudstack-common-(.*).el6.x86_64.rpm/cloudstack-common-${version}.el6.x86_64.rpm/" tools/docker/Dockerfile.centos6
82+
perl -pi -e "s/cloudstack-management-(.*)el6.x86_64.rpm/cloudstack-management-${version}.el6.x86_64.rpm/" tools/docker/Dockerfile.centos6
83+
perl -pi -e "s/Marvin-(.*).tar.gz/Marvin-${version}.tar.gz/" tools/docker/Dockerfile.marvin
84+
# systemtpl.sh: system vm template version without -SNAPSHOT
85+
7686
git clean -f
7787

7888
echo 'commit changes'

‎tools/docker/Dockerfile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@
2020
FROM ubuntu:14.04
2121

2222
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
23-
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
23+
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.10.0.0-SNAPSHOT"
2424

2525
RUN apt-get -y update && apt-get install -y \
2626
genisoimage \
27+
libffi-dev \
28+
libssl-dev \
2729
git \
2830
maven \
2931
openjdk-7-jdk \
3032
python-dev \
3133
python-setuptools \
3234
python-pip \
35+
python-mysql.connector \
3336
supervisor
3437

3538
RUN echo 'mysql-server mysql-server/root_password password root' | debconf-set-selections; \
@@ -40,7 +43,7 @@ RUN apt-get install -qqy mysql-server && \
4043

4144
RUN (/usr/bin/mysqld_safe &); sleep 5; mysqladmin -u root -proot password ''
4245

43-
RUN pip install --allow-external mysql-connector-python mysql-connector-python
46+
#RUN pip install --allow-external mysql-connector-python mysql-connector-python
4447

4548
COPY tools/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
4649
COPY . ./root
@@ -49,10 +52,10 @@ WORKDIR /root
4952
RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
5053

5154
RUN (/usr/bin/mysqld_safe &); \
52-
sleep 3; \
55+
sleep 5; \
5356
mvn -Pdeveloper -pl developer -Ddeploydb; \
5457
mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
55-
MARVIN_FILE=`find tools/marvin/dist/ -name "Marvin*.tar.gz"` \
58+
MARVIN_FILE=`find /root/tools/marvin/dist/ -name "Marvin*.tar.gz"`; \
5659
pip install $MARVIN_FILE
5760

5861
EXPOSE 8080 8096

‎tools/docker/Dockerfile.centos6‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
FROM centos:6
1919

2020
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
21-
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
21+
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.10.0.0-SNAPSHOT"
2222

23-
ENV PKG_URL=http://jenkins.buildacloud.org/job/package-rhel63-master/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64
23+
ENV PKG_URL=https://builds.cloudstack.org/job/package-master-rhel63/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64
2424

2525
# install CloudStack
26+
RUN rpm -i http://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.3-1.el6.x86_64.rpm
27+
2628
RUN yum install -y nc wget \
27-
${PKG_URL}/cloudstack-common-4.6.0-SNAPSHOT.el6.x86_64.rpm \
28-
${PKG_URL}/cloudstack-management-4.6.0-SNAPSHOT.el6.x86_64.rpm
29+
${PKG_URL}/cloudstack-common-4.10.0.0-SNAPSHOT.el6.x86_64.rpm \
30+
${PKG_URL}/cloudstack-management-4.10.0.0-SNAPSHOT.el6.x86_64.rpm
2931

3032
RUN cd /etc/cloudstack/management; \
3133
ln -s tomcat6-nonssl.conf tomcat6.conf; \

‎tools/docker/Dockerfile.marvin‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020
FROM python:2
2121

2222
MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
23-
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
23+
LABEL Vendor="Apache.org" License="ApacheV2" Version="4.10.0.0-SNAPSHOT"
2424

2525
ENV WORK_DIR=/marvin
2626

27-
ENV PKG_URL=http://jenkins.buildacloud.org/job/cloudstack-marvin-master/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.6.0-SNAPSHOT.tar.gz
27+
ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.10.0.0-SNAPSHOT.tar.gz
2828

29+
RUN apt-get update && apt-get install -y vim
2930
RUN pip install --upgrade paramiko nose requests
30-
RUN pip install --allow-external mysql-connector-python mysql-connector-python
31+
#RUN pip install --allow-external mysql-connector-python mysql-connector-python
32+
RUN pip install http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df
3133
RUN pip install ${PKG_URL}
3234

3335
RUN mkdir -p ${WORK_DIR}

‎tools/docker/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ docker run -ti --rm --name marvin --link simulator:8096 cloudstack/marvin
3737
Deploy Cloud using marvin:
3838

3939
```
40-
docker run -ti --rm --link simulator:8096 cloudstack/marvin python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/advanced.cfg
40+
docker run -ti --rm --link simulator:8096 cloudstack/marvin python /marvin/marvin/deployDataCenter.py -i /marvin/dev/advanced.cfg
4141
```
4242

4343
Perform Smoke tests against CloudStack Simulator containter:

0 commit comments

Comments
 (0)