Merge branch 'feature/image' into 'master'

Feature/image

See merge request QA/qg-dockerfiles!7

baseimg/jenkins/java-slave-new/dockerfile

-# base FROM jenkins/ssh-slave
-FROM 192.168.4.4/baseimg/jenkins-slave
+FROM jenkins/ssh-slave
 
 USER root
 
@@ -7,8 +6,6 @@ WORKDIR /opt
 
 # ------ java -----
 
-# RUN wget http://mirrors.hust.edu.cn/apache/maven/maven-3/3.5.2/binaries/apache-maven-3.5.2-bin.tar.gz
-
 COPY ./apache-maven-3.6.0-bin.tar.gz /opt
 
 RUN tar zxf apache-maven-3.6.0-bin.tar.gz

baseimg/jenkins/node8-slave/dockerfile

-# base FROM jenkins/ssh-slave
-FROM 192.168.4.4/baseimg/jenkins-slave
-
+FROM jenkins/ssh-slave
 USER root
 
 RUN chmod 777 /root
@@ -9,7 +7,6 @@ WORKDIR /root
 
 # ------ node -----
 
-# wget wget https://nodejs.org/dist/v8.9.1/node-v8.9.1-linux-x64.tar.xz 
 ADD ./node-v8.9.1-linux-x64.tar.xz /usr/local
 
 # ENV