[GitHub] rhtyd closed pull request #1432: Fix for CLOUDSTACK-9253

[GitBox <gi...@apache.org>]

rhtyd closed pull request #1432: Fix for CLOUDSTACK-9253
URL: https://github.com/apache/cloudstack/pull/1432
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 9d8b2e062b6..3fe14cea891 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,7 +20,7 @@
 FROM ubuntu:14.04
 
 MAINTAINER "Apache CloudStack" <de...@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.8.0"
 
 RUN apt-get -y update && apt-get install -y \
     genisoimage \
@@ -40,8 +40,6 @@ RUN apt-get install -qqy mysql-server && \
 
 RUN (/usr/bin/mysqld_safe &); sleep 5; mysqladmin -u root -proot password ''
 
-RUN pip install --allow-external mysql-connector-python mysql-connector-python
-
 COPY tools/docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY . ./root
 WORKDIR /root
@@ -51,9 +49,12 @@ RUN mvn -Pdeveloper -Dsimulator -DskipTests clean install
 RUN (/usr/bin/mysqld_safe &); \
     sleep 3; \
     mvn -Pdeveloper -pl developer -Ddeploydb; \
-    mvn -Pdeveloper -pl developer -Ddeploydb-simulator; \
-    MARVIN_FILE=`find tools/marvin/dist/ -name "Marvin*.tar.gz"` \
-    pip install $MARVIN_FILE
+    mvn -Pdeveloper -pl developer -Ddeploydb-simulator
+
+RUN pip install http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip
+RUN pip install paramiko
+RUN pip install /root/tools/marvin/dist/Marvin*.tar.gz
+   
 
 EXPOSE 8080 8096
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services