Upgrade sonar-scala to 6.5.0.

mwz · mwz · commit c7ed17880fcd · 2018-07-09T01:14:03.000+01:00
diff --git a/2.7.0-full/Dockerfile b/2.7.0-full/Dockerfile
@@ -0,0 +1,12 @@
+# SonarQube 6.7.4 LTS image with bundled sonar-scala 6.5.0 (https://github.com/mwz/sonar-scala).
+
+FROM sonarqube:6.7.4-alpine
+
+ENV SONAR_SCALA_VERSION 6.5.0
+
+WORKDIR /opt/sonarqube/extensions/plugins
+RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
+    "https://dl.bintray.com/mwz/maven/com/github/mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/sonar-scala_2.12-${SONAR_SCALA_VERSION}-assembly.jar"
+
+WORKDIR $SONARQUBE_HOME
+ENTRYPOINT ["./bin/run.sh"]
diff --git a/2.7.0/Dockerfile b/2.7.0/Dockerfile
@@ -0,0 +1,12 @@
+# Alpine image with bundled sonar-scala 6.5.0 (https://github.com/mwz/sonar-scala),
+# which can be mounted as a volume into a SonarQube container.
+
+FROM alpine:3.7
+
+ENV SONAR_SCALA_VERSION 6.5.0
+
+RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.7/community wget ca-certificates
+
+WORKDIR /opt/sonarqube/extensions/plugins
+RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
+    "https://dl.bintray.com/mwz/maven/com/github/mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/sonar-scala_2.12-${SONAR_SCALA_VERSION}-assembly.jar"
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ docker-compose up -d
 
 Once docker pulls all the required images and starts up the containers, the application should become available on [http://localhost](http://localhost). The default SonarQube login details for the Administrator account are `admin:admin`.
 
-You can also use a standalone docker image which contains SonarQube LTS with bundled Scala plugins [`mwizner/sonarqube-scala-plugins:2.6.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins).
+You can also use a standalone docker image which contains SonarQube LTS with bundled Scala plugins [`mwizner/sonarqube-scala-plugins:2.7.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins).
 
 To start the container issue the following command:
 ```bash
@@ -23,21 +23,22 @@ docker run -d --name sonarqube-scala-plugins-full \
   -e SONARQUBE_JDBC_USERNAME=sonar \
   -e SONARQUBE_JDBC_PASSWORD=sonar \
   -e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
-  mwizner/sonarqube-scala-plugins:2.6.0-full
+  mwizner/sonarqube-scala-plugins:2.7.0-full
 ```
 Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable, SonarQube will use an embedded H2 database, which is not recommended in production.
 
+
 ## Dependencies
  * [SonarQube 6.7 LTS](https://hub.docker.com/_/sonarqube)
  * [PostgreSQL 10](https://hub.docker.com/_/postgres)
- * External SonarQube plugins:
-   * [mwz/sonar-scala](https://github.com/mwz/sonar-scala) - provides support for scalastyle and scoverage.
-   * [arthepsy/sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) - adds scapegoat inspections.
+ * [mwz/sonar-scala](https://github.com/mwz/sonar-scala) - provides support for scalastyle, scoverage and scapegoat.
+ * versions before `2.7.0` used [arthepsy/sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) for scapegoat support.
 
 
 ## Compatibility Matrix
 Version | SonarQube | sonar-scala | sonar-scala-extra
 --------|-----------|-------------|------------------
+[2.7.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.7.0) | 6.7.4 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14377)) | [6.5.0](https://github.com/mwz/sonar-scala/releases/tag/v6.5.0) |
 [2.6.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.6.0) | 6.7.4 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14377)) | [6.4.0](https://github.com/mwz/sonar-scala/releases/tag/v6.4.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
 [2.5.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.5.0) | 6.7.3 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14264)) | [6.4.0](https://github.com/mwz/sonar-scala/releases/tag/v6.4.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
 [2.4.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.4.0) | 6.7.3 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14264)) | [6.3.0](https://github.com/mwz/sonar-scala/releases/tag/v6.3.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
@@ -47,11 +48,14 @@ Version | SonarQube | sonar-scala | sonar-scala-extra
 [2.1.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.1.0), [2.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.0.0) | 6.7.1 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation)) ([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14137)) | [6.0.0](https://github.com/mwz/sonar-scala/releases/tag/v6.0.0) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
 [1.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/1.0.0) | 5.6.7 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE56/Documentation)) | [0.0.3](https://github.com/Sagacify/sonar-scala/releases/tag/v0.0.3) | [1.3.0](https://github.com/arthepsy/sonar-scala-extra/releases/tag/v1.3.0)
 
+Please note, that starting from version `2.7.0`, the images no longer contain the [sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) plugin as sonar-scala provides Scapegoat support from version `6.5.0` onwards.
 
 ## Recommendations
 [sbt-sonar](https://github.com/mwz/sbt-sonar) is an sbt plugin which provides a way to automate analysis of Scala projects with SonarQube.
 
+
 ## Changelog
+- **2.7.0** - Upgraded sonar-scala to 6.5.0, which brings support for scapegoat.
 - **2.6.0** - Upgraded SonarQube to 6.7.4.
 - **2.5.0** - Upgraded sonar-scala to 6.4.0.
 - **2.4.0** - Upgraded sonar-scala to 6.3.0.
@@ -62,5 +66,6 @@ Version | SonarQube | sonar-scala | sonar-scala-extra
 - **2.0.0** - SonarQube 6.7.1 LTS.
 - **1.0.0** - SonarQube 5.6.7 LTS.
 
+
 ## License
 The project is licensed under the Apache License v2. See the [LICENSE file](LICENSE) for more details.
diff --git a/README_DOCKERHUB.md b/README_DOCKERHUB.md
@@ -1,10 +1,14 @@
 Docker images with out-of-the-box [SonarQube LTS](https://www.sonarqube.org) instance with support for [Scala](http://www.scala-lang.org), [Scoverage](https://github.com/scoverage/scalac-scoverage-plugin) (code coverage metrics) and [Scalastyle](http://www.scalastyle.org) + [Scapegoat](https://github.com/sksamuel/scapegoat) (static code analysis).
 
+
 ## Available versions
+There are two types of images available: images with [sonar-scala](https://github.com/mwz/sonar-scala) plugin, which can be mounted as a volume into a SonarQube container and images which bundle sonar-scala plugin with SonarQube (suffixed with `-full`).
 
-There are two types of images available: images with [sonar-scala](https://github.com/mwz/sonar-scala) and [sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) plugins, which can be mounted as a volume into a SonarQube container and images which bundle those plugins with SonarQube (suffixed with `-full`). 
+Starting from version `2.7.0`, the images no longer contain the [sonar-scala-extra](https://github.com/arthepsy/sonar-scala-extra) plugin as sonar-scala provides Scapegoat support from version `6.5.0` onwards.
 
-- `2.6.0`, `latest` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.6.0/Dockerfile), [(v2.6.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.6.0)
+- `2.7.0`, `latest` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.7.0/Dockerfile), [(v2.7.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.7.0)
+- `2.7.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.7.0-full/Dockerfile), [(v2.6.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.6.0)
+- `2.6.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.6.0/Dockerfile), [(v2.6.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.6.0)
 - `2.6.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.6.0-full/Dockerfile), [(v2.6.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.6.0)
 - `2.5.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.5.0/Dockerfile), [(v2.5.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.5.0)
 - `2.5.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.5.0-full/Dockerfile), [(v2.4.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.5.0)
@@ -19,9 +23,12 @@ There are two types of images available: images with [sonar-scala](https://githu
 - `2.1.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.1.0/Dockerfile), [(v2.1.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.1.0)
 - `2.1.0-full` ([Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.1.0-full/Dockerfile)), [(v2.1.0)](https://github.com/mwz/sonar-scala-docker/releases/tag/2.1.0)
 
+
 ## What's included
 Version | SonarQube | sonar-scala | sonar-scala-extra
 --------|-----------|-------------|------------------
+2.7.0 | | 6.5.0 |
+2.7.0-full | 6.7.4 LTS | 6.5.0 |
 2.6.0 | | 6.4.0 | 1.3.0
 2.6.0-full | 6.7.4 LTS | 6.4.0 | 1.3.0
 2.5.0 | | 6.4.0 | 1.3.0
@@ -37,6 +44,7 @@ Version | SonarQube | sonar-scala | sonar-scala-extra
 2.1.0 | | 6.0.0 | 1.3.0
 2.1.0-full | 6.7.1 LTS | 6.0.0 | 1.3.0
 
+
 ## Usage
 To use one of the volume images, mount it as a volume to your existing SonarQube container using e.g. `docker-compose`:
 ```
@@ -53,7 +61,7 @@ services:
       - plugins
 
   plugins:
-    image: mwizner/sonarqube-scala-plugins:2.6.0
+    image: mwizner/sonarqube-scala-plugins:2.7.0
     volumes:
       - sonarqube_plugins:/opt/sonarqube/extensions/plugins
     command: /bin/true
@@ -75,10 +83,11 @@ docker run -d --name sonarqube-scala-plugins-full \
   -e SONARQUBE_JDBC_USERNAME=sonar \
   -e SONARQUBE_JDBC_PASSWORD=sonar \
   -e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \
-  mwizner/sonarqube-scala-plugins:2.6.0-full
+  mwizner/sonarqube-scala-plugins:2.7.0-full
 ```
 
 Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable, SonarQube will use an embedded H2 database, which is not recommended in production.
 
+
 ## Repository
 This project is open-sourced and can be found on [Github](https://github.com/mwz/sonar-scala-docker).
diff --git a/dev/Dockerfile b/dev/Dockerfile
@@ -1,17 +1,12 @@
-# Alpine image with bundled Scala plugins
-# sonar-scala (https://github.com/mwz/sonar-scala)
-# and sonar-scala-extra (https://github.com/arthepsy/sonar-scala-extra),
+# Alpine image with bundled sonar-scala plugin (https://github.com/mwz/sonar-scala),
 # which can be mounted as a volume into a SonarQube container.
 # This image is intended to be used for local development purposes.
 
 FROM alpine:3.7
 
-ARG SONAR_SCAPEGOAT_VERSION=1.3.0
 ARG SONAR_SCALA_VERSION
 
 RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.7/community wget ca-certificates
 
 WORKDIR /opt/sonarqube/extensions/plugins
-RUN wget -O "sonar-scapegoat-plugin-${SONAR_SCAPEGOAT_VERSION}.jar" \
-    "https://github.com/arthepsy/sonar-scala-extra/releases/download/v${SONAR_SCAPEGOAT_VERSION}/sonar-scapegoat-plugin-${SONAR_SCAPEGOAT_VERSION}.jar"
 ADD sonar-scala_2.12-assembly.jar .
diff --git a/dev/build.sh b/dev/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
 
-export SONAR_SCALA_VERSION=6.5.0-SNAPSHOT
+export SONAR_SCALA_VERSION=6.6.0-SNAPSHOT
 cp ~/.ivy2/local/com.github.mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.12-assembly.jar .
 docker build -t mwizner/sonarqube-scala-plugins:dev --build-arg SONAR_SCALA_VERSION=${SONAR_SCALA_VERSION} .
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
       - postgresql_data:/var/lib/postgresql/data
 
   plugins:
-    image: mwizner/sonarqube-scala-plugins:2.6.0
+    image: mwizner/sonarqube-scala-plugins:2.7.0
     volumes:
       - sonarqube_plugins:/opt/sonarqube/extensions/plugins
     command: /bin/true
diff --git a/release.sh b/release.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -eu
 
-export VERSION=2.6.0
+export VERSION=2.7.0
 
 # Build
 docker build -t mwizner/sonarqube-scala-plugins:$VERSION -t mwizner/sonarqube-scala-plugins:latest $VERSION
