Merge branch 'master' of git.quantgroup.cn:QA/qg-dockerfiles

baseimg/jenkins/docker-slave/dockerfile → baseimg/jenkins/java-slave/dockerfile

@@ -35,8 +35,10 @@ ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin:/usr/local/node-v8.9.1-linux-x64/bin
 	
 #------------
 	
-RUN npm install bower -g
-RUN npm install grunt-cli -g 
+RUN npm install -g bower 
+RUN npm install -g grunt-cli 
+RUN npm install -g node-gyp 
+RUN npm install -g node-pre-gyp
 
 
 

baseimg/jenkins/node7-slave/dockerfile

+# base FROM jenkins/ssh-slave
+FROM 192.168.4.36/baseimg/jenkins-slave
+
+USER root
+
+RUN chmod 777 /root
+
+WORKDIR /root
+
+# ------ node -----
+# wget node-v7.6.0-linux-x64.tar.xz
+ADD ./node-v7.6.0-linux-x64.tar.xz /usr/local
+
+# ENV
+ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin:/usr/local/node-v7.6.0-linux-x64/bin
+
+RUN npm install -g bower 
+RUN npm install -g grunt-cli 
+
+
+
+

baseimg/jenkins/node7-slave/readme.txt

+wget https://nodejs.org/dist/v7.6.0/node-v8.9.1-linux-x64.tar.xz
\ No newline at end of file

baseimg/jenkins/node8-slave/dockerfile

+# base FROM jenkins/ssh-slave
+FROM 192.168.4.36/baseimg/jenkins-slave
+
+USER root
+
+RUN chmod 777 /root
+
+WORKDIR /root
+
+# ------ node -----
+
+# wget node-v8.9.1-linux-x64.tar.xz
+ADD ./node-v8.9.1-linux-x64.tar.xz /usr/local
+
+# ENV
+ENV PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin:/usr/local/node-v8.9.1-linux-x64/bin
+	
+#------------
+
+RUN npm install -g bower 
+RUN npm install -g grunt-cli 
+
+
+

baseimg/jenkins/node8-slave/readme.txt

+wget https://nodejs.org/dist/v7.6.0/node-v8.9.1-linux-x64.tar.xz
\ No newline at end of file