diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 62aab1d..f1424cf --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,8 @@ RUN set -x \ && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.10/gosu-$(dpkg --print-architecture)" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/1.10/gosu-$(dpkg --print-architecture).asc" \ && export GNUPGHOME="$(mktemp -d)" \ - && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ + && (gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + || gpg --no-tty --keyserver ipv4.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -34,8 +34,8 @@ RUN set -x \ # sub 2048R/06855C1D 2015-05-25 # commented out due to build failures from key server - && (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys F1182E81C792928921DBCAB4CFCA4A29D26468DE \ - || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys F1182E81C792928921DBCAB4CFCA4A29D26468DE) \ + && (gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys F1182E81C792928921DBCAB4CFCA4A29D26468DE \ + || gpg --no-tty --keyserver ipv4.pool.sks-keyservers.net --recv-keys F1182E81C792928921DBCAB4CFCA4A29D26468DE) \ && cd /opt \ && curl -o sonarqube.zip -fSL https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-$SONAR_VERSION.zip \ @@ -45,7 +45,10 @@ RUN set -x \ && mv sonarqube-$SONAR_VERSION sonarqube \ && chown -R sonarqube:sonarqube sonarqube \ && rm sonarqube.zip* \ - && rm -rf $SONARQUBE_HOME/bin/* + && rm -rf $SONARQUBE_HOME/bin/* \ + && curl -o sonar-ts-plugin-1.1.0.jar -fSL https://github.com/Pablissimo/SonarTsPlugin/releases/download/v1.1.0/sonar-typescript-plugin-1.1.0.jar \ + && mv sonar-ts-plugin-1.1.0.jar $SONARQUBE_HOME/extensions/plugins/ \ + && rm $SONARQUBE_HOME/extensions/plugins/sonar-typescript-* VOLUME "$SONARQUBE_HOME/data" diff --git a/run.sh b/run.sh old mode 100644 new mode 100755