Upgrade SonarQube to 6.7.7 LTS. (#13)

sonar-scala · May 26, 2019 · 936119d · 936119d
1 parent e5097e8
commit 936119d
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 12 deletions.
diff --git a/2.12.0-full/Dockerfile b/2.12.0-full/Dockerfile
@@ -0,0 +1,12 @@
+# SonarQube 6.7.7 LTS image with bundled sonar-scala 6.8.0 (https://github.com/mwz/sonar-scala).
+
+FROM sonarqube:6.7.7-community
+
+ENV SONAR_SCALA_VERSION 6.8.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.12.0/Dockerfile b/2.12.0/Dockerfile
@@ -0,0 +1,13 @@
+# Minideb image with bundled sonar-scala 6.8.0 (https://github.com/mwz/sonar-scala),
+# which can be mounted as a volume into a SonarQube container.
+
+FROM bitnami/minideb:stretch
+RUN install_packages curl ca-certificates
+
+ENV SONAR_SCALA_VERSION 6.8.0
+
+RUN groupadd -r sonarqube && useradd -r -g sonarqube sonarqube
+WORKDIR /opt/sonarqube/extensions/plugins
+RUN curl -L -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" 
+RUN chown -R sonarqube:sonarqube /opt/sonarqube
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # sonar-scala-docker
 [![GitHub version](https://img.shields.io/badge/release-v3.6.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
-[![GitHub version lts](https://img.shields.io/badge/release_(LTS)-v2.11.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
+[![GitHub version lts](https://img.shields.io/badge/release_(LTS)-v2.12.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
 [![Docker Pulls](https://img.shields.io/docker/pulls/mwizner/sonarqube-scala-plugins.svg)](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)
 
 Docker images and docker-compose recipes for out-of-the-box [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts) and [SonarQube 7.7](https://www.sonarqube.org/sonarqube-7-7) 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). :sunglasses:
@@ -19,7 +19,7 @@ docker-compose -f docker-compose-lts.yml 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 server with bundled sonar-scala plugin, [`mwizner/sonarqube-scala-plugins:3.6.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins) and [`mwizner/sonarqube-scala-plugins:2.11.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins) for the LTS version.
+You can also use a standalone docker image which contains SonarQube server with bundled sonar-scala plugin, [`mwizner/sonarqube-scala-plugins:3.6.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins) and [`mwizner/sonarqube-scala-plugins:2.12.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins) for the LTS version.
 
 To start the container issue the following command:
 ```bash
@@ -58,7 +58,8 @@ Version | SonarQube | sonar-scala | sonar-scala-extra
 [3.2.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/3.2.0) | 7.4 ([documentation](https://docs.sonarqube.org/7.4))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14549)) | [7.2.0](https://github.com/mwz/sonar-scala/releases/tag/v7.2.0)
 [3.1.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/3.1.0) | 7.4 ([documentation](https://docs.sonarqube.org/7.4))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14549)) | [7.1.0](https://github.com/mwz/sonar-scala/releases/tag/v7.1.0)
 [3.0.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/3.0.0) | 7.3 ([documentation](https://docs.sonarqube.org/display/SONARQUBE73/Documentation))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14464)) | [7.0.0](https://github.com/mwz/sonar-scala/releases/tag/v7.0.0)
-[2.11.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.11.0) | 6.7.6 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=13972)) | [6.8.0](https://github.com/mwz/sonar-scala/releases/tag/v6.8.0)
+[2.12.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.12.0) | 6.7.7 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14865)) | [6.8.0](https://github.com/mwz/sonar-scala/releases/tag/v6.8.0)
+[2.11.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.11.0) | 6.7.6 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=13972)) | [6.8.0](https://github.com/mwz/sonar-scala/releases/tag/v6.8.0) | 
 [2.10.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.10.0) | 6.7.6 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=13972)) | [6.7.0](https://github.com/mwz/sonar-scala/releases/tag/v6.7.0) | 
 [2.9.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.9.0) | 6.7.5 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14467)) | [6.6.0](https://github.com/mwz/sonar-scala/releases/tag/v6.6.0) | 
 [2.8.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/2.8.0) | 6.7.5 LTS ([documentation](https://docs.sonarqube.org/display/SONARQUBE67/Documentation))([changelog](https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14467)) | [6.5.1](https://github.com/mwz/sonar-scala/releases/tag/v6.5.1) | 
@@ -87,6 +88,7 @@ Please note, that starting from version `2.7.0`, the images no longer contain th
 - **3.2.0** - Upgraded sonar-scala to 7.2.0.
 - **3.1.0** - Upgraded sonar-scala to 7.1.0 & SonarQube to 7.4.
 - **3.0.0** - Upgraded sonar-scala to 7.0.0 & SonarQube to 7.3.
+- **2.12.0** - Upgraded SonarQube to 6.7.7 LTS.
 - **2.11.0** - Upgraded sonar-scala to 6.8.0.
 - **2.10.0** - Upgraded sonar-scala to 6.7.0 & SonarQube to 6.7.6.
 - **2.9.0** - Upgraded sonar-scala to 6.6.0.

diff --git a/README.tpl.md b/README.tpl.md
@@ -75,6 +75,7 @@ Please note, that starting from version `2.7.0`, the images no longer contain th
 - **3.2.0** - Upgraded sonar-scala to 7.2.0.
 - **3.1.0** - Upgraded sonar-scala to 7.1.0 & SonarQube to 7.4.
 - **3.0.0** - Upgraded sonar-scala to 7.0.0 & SonarQube to 7.3.
+- **2.12.0** - Upgraded SonarQube to 6.7.7 LTS.
 - **2.11.0** - Upgraded sonar-scala to 6.8.0.
 - **2.10.0** - Upgraded sonar-scala to 6.7.0 & SonarQube to 6.7.6.
 - **2.9.0** - Upgraded sonar-scala to 6.6.0.

diff --git a/README_DOCKERHUB.md b/README_DOCKERHUB.md
@@ -8,7 +8,7 @@ Starting from version `2.7.0`, the images no longer contain the [sonar-scala-ext
 
 #### Current
 - `3.6.0` (latest) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.6.0/Dockerfile), `3.6.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.6.0-full/Dockerfile), [Release 3.6.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.6.0)
-- `2.11.0` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.11.0/Dockerfile), `2.11.0-full` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.11.0-full/Dockerfile), [Release 2.11.0](https://github.com/mwz/sonar-scala-docker/releases/tag/2.11.0)
+- `2.12.0` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.12.0/Dockerfile), `2.12.0-full` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.12.0-full/Dockerfile), [Release 2.12.0](https://github.com/mwz/sonar-scala-docker/releases/tag/2.12.0)
 #### Older
 - `3.5.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.5.0/Dockerfile), `3.5.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.5.0-full/Dockerfile), [Release 3.5.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.5.0)
 - `3.4.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.4.0/Dockerfile), `3.4.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.4.0-full/Dockerfile), [Release 3.4.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.4.0)
@@ -17,6 +17,7 @@ Starting from version `2.7.0`, the images no longer contain the [sonar-scala-ext
 - `3.2.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.2.0/Dockerfile), `3.2.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.2.0-full/Dockerfile), [Release 3.2.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.2.0)
 - `3.1.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.1.0/Dockerfile), `3.1.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.1.0-full/Dockerfile), [Release 3.1.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.1.0)
 - `3.0.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.0.0/Dockerfile), `3.0.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.0.0-full/Dockerfile), [Release 3.0.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.0.0)
+- `2.11.0` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.11.0/Dockerfile), `2.11.0-full` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.11.0-full/Dockerfile), [Release 2.11.0](https://github.com/mwz/sonar-scala-docker/releases/tag/2.11.0)
 - `2.10.0` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.10.0/Dockerfile), `2.10.0-full` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.10.0-full/Dockerfile), [Release 2.10.0](https://github.com/mwz/sonar-scala-docker/releases/tag/2.10.0)
 - `2.9.0` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.9.0/Dockerfile), `2.9.0-full` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.9.0-full/Dockerfile), [Release 2.9.0](https://github.com/mwz/sonar-scala-docker/releases/tag/2.9.0)
 - `2.8.0` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.8.0/Dockerfile), `2.8.0-full` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.8.0-full/Dockerfile), [Release 2.8.0](https://github.com/mwz/sonar-scala-docker/releases/tag/2.8.0)
@@ -49,6 +50,8 @@ Version | SonarQube | sonar-scala | sonar-scala-extra
 3.1.0-full | 7.4 | 7.1.0
 3.0.0 || 7.0.0
 3.0.0-full | 7.3 | 7.0.0
+2.12.0 || 6.8.0 | 
+2.12.0-full | 6.7.7 LTS | 6.8.0 | 
 2.11.0 || 6.8.0 | 
 2.11.0-full | 6.7.6 LTS | 6.8.0 | 
 2.10.0 || 6.7.0 | 
@@ -82,7 +85,7 @@ version: "2"
 
 services:
   sonarqube:
-    image: sonarqube:7.4-community
+    image: sonarqube:7.7-community
     ports:
       - "80:9000"
     networks:

diff --git a/README_DOCKERHUB.tpl.md b/README_DOCKERHUB.tpl.md
@@ -42,7 +42,7 @@ version: "2"
 
 services:
   sonarqube:
-    image: sonarqube:7.4-community
+    image: sonarqube:7.7-community
     ports:
       - "80:9000"
     networks:

diff --git a/docker-compose-lts.yml b/docker-compose-lts.yml
@@ -2,7 +2,7 @@ version: "2"
 
 services:
   sonarqube-lts:
-    image: sonarqube:6.7.6-community # lts
+    image: sonarqube:6.7.7-community # lts
     ports:
       - "80:9000"
     networks:
@@ -21,7 +21,7 @@ services:
     depends_on:
       - db-lts
   db-lts:
-    image: postgres:10.6-alpine
+    image: postgres:10.8-alpine
     networks:
       - sonarnet_lts
     environment:
@@ -31,7 +31,7 @@ services:
       - postgresql_lts:/var/lib/postgresql
       - postgresql_lts_data:/var/lib/postgresql/data
   plugins-lts:
-    image: mwizner/sonarqube-scala-plugins:2.11.0
+    image: mwizner/sonarqube-scala-plugins:2.12.0
     volumes:
       - sonarqube_lts_plugins:/opt/sonarqube/extensions/plugins
     command: /bin/true

diff --git a/vars.js b/vars.js
@@ -7,10 +7,10 @@
     "sonarScala": "7.5.0"
   },
   "lts": {
-    "version": "2.11.0",
-    "sonar": "6.7.6 LTS",
+    "version": "2.12.0",
+    "sonar": "6.7.7 LTS",
     "sonarDocs": "https://docs.sonarqube.org/display/SONARQUBE67/Documentation",
-    "sonarChangelog": "https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=13972",
+    "sonarChangelog": "https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=14865",
     "sonarScala": "6.8.0"
   },
   "versions": {
@@ -66,6 +66,13 @@
       }
     ],
     "lts": [
+      {
+        "version": "2.11.0",
+        "sonar": "6.7.6 LTS",
+        "sonarDocs": "https://docs.sonarqube.org/display/SONARQUBE67/Documentation",
+        "sonarChangelog": "https://jira.sonarsource.com/jira/secure/ReleaseNote.jspa?projectId=10930&version=13972",
+        "sonarScala": "6.8.0"
+      },
       {
         "version": "2.10.0",
         "sonar": "6.7.6 LTS",