Merge remote-tracking branch 'origin/master'

Dockerfile

@@ -16,14 +16,14 @@ RUN apt-get -f install -y curl unzip wget tar
 RUN echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
 RUN apt-get install -y oracle-java8-installer 
 RUN apt-get install -y oracle-java8-set-default
-RUN curl --insecure -o ./sonarscanner.zip -L https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.2.0.1227-linux.zip
+ADD ./sonar-scanner-cli-3.2.0.1227-linux.zip ./sonarscanner.zip
 RUN unzip sonarscanner.zip
 RUN rm sonarscanner.zip
 ENV SONAR_RUNNER_HOME=/sonar-scanner-3.2.0.1227-linux
 ENV PATH $PATH:/sonar-scanner-3.2.0.1227-linux/bin
-RUN wget http://www-us.apache.org/dist/tomcat/tomcat-9/v9.0.10/bin/apache-tomcat-9.0.10.tar.gz
-RUN tar xzf apache-tomcat-9.0.10.tar.gz
-RUN mv apache-tomcat-9.0.10 apache-tomcat9
+RUN wget http://mirrors.hust.edu.cn/apache/tomcat/tomcat-9/v9.0.12/bin/apache-tomcat-9.0.12.tar.gz
+RUN tar xzf apache-tomcat-9.0.12.tar.gz
+RUN mv apache-tomcat-9.0.12 apache-tomcat9
 RUN wget http://mirrors.hust.edu.cn/apache/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
 RUN tar xzvf apache-maven-3.5.4-bin.tar.gz
 RUN ln -s apache-maven-3.5.4 apache-maven

Jenkinsfile

@@ -3,7 +3,7 @@ pipeline {
         dockerfile {
             filename 'Dockerfile'
             registryUrl 'https://registry.docker-cn.com'
-            args '-p 84:84 -p 8081:8080 --security-opt apparmor=unconfined'
+            args '-p 8081:8080 --security-opt apparmor=unconfined'
         }
     }
     stages {
@@ -24,7 +24,7 @@ pipeline {
         }
         stage('Start Tomcat9'){
             steps {
-                sh '/apache-tomcat9/bin/startup.sh'
+                sh '/apache-tomcat9/bin/catalina.sh run'
             }
         }
         stage('Deliver'){