Upgrade sonar-scala to 6.8.0 LTS. (#9)

mwz · web-flow · commit b7d321ad788d · 2019-03-03T19:47:44.000Z
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,6 +40,30 @@ jobs:
             ./release.sh
             git tag -a $VERSION -m "Release $VERSION."
             git push --tags
+  release-lts:
+    docker:
+      - image: circleci/openjdk:8-jdk
+    steps:
+      - checkout
+      - add_ssh_keys:
+          fingerprints:
+            - "31:63:53:c4:af:b7:2c:a1:62:8e:b0:11:83:f8:62:eb"
+      - run:
+          name: Set up git
+          command: |
+            git config --global user.name "CircleCI"
+            git config --global user.email "mwz@users.noreply.github.com"
+            ssh-keyscan -T 15 github.com >> ~/.ssh/known_hosts
+      - setup_remote_docker
+      - run:
+          name: Release LTS
+          command: |
+            sudo apt-get install -y jq
+            export VERSION=`jq -r '.lts.version' vars.js`
+            echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
+            ./release-lts.sh
+            git tag -a $VERSION -m "Release $VERSION."
+            git push --tags
 workflows:
   version: 2
   pr-build:
@@ -55,9 +79,20 @@ workflows:
           filters:
             branches:
               only: master
+      - hold-lts:
+          type: approval
+          filters:
+            branches:
+              only: master
       - release:
           requires:
             - hold
           filters:
             branches:
               only: master
+      - release-lts:
+          requires:
+            - hold-lts
+          filters:
+            branches:
+              only: master
diff --git a/2.11.0-full/Dockerfile b/2.11.0-full/Dockerfile
@@ -0,0 +1,12 @@
+# SonarQube 6.7.6 LTS image with bundled sonar-scala 6.8.0 (https://github.com/mwz/sonar-scala).
+
+FROM sonarqube:6.7.6-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.11.0/Dockerfile b/2.11.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.4.0-blue.svg)](https://github.com/mwz/sonarqube-scala-docker/releases)
-[![GitHub version lts](https://img.shields.io/badge/release_(LTS)-v2.10.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)
 [![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.4](https://www.sonarqube.org/sonarqube-7-4) 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.4.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins) and [`mwizner/sonarqube-scala-plugins:2.10.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.4.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.
 
 To start the container issue the following command:
 ```bash
@@ -56,7 +56,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.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.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) | 
 [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) | 
@@ -82,6 +83,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.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.
 - **2.8.0** - Upgraded sonar-scala to 6.5.1 & SonarQube to 6.7.5.
diff --git a/README.tpl.md b/README.tpl.md
@@ -73,6 +73,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.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.
 - **2.8.0** - Upgraded sonar-scala to 6.5.1 & SonarQube to 6.7.5.
diff --git a/README_DOCKERHUB.md b/README_DOCKERHUB.md
@@ -8,13 +8,14 @@ Starting from version `2.7.0`, the images no longer contain the [sonar-scala-ext
 
 #### Current
 - `3.4.0` (latest) [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)
-- `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.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)
 #### Older
 - `3.3.0` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.3.0/Dockerfile), `3.3.0-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.3.0-full/Dockerfile), [Release 3.3.0](https://github.com/mwz/sonar-scala-docker/releases/tag/3.3.0)
 - `3.2.1` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.2.1/Dockerfile), `3.2.1-full` [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/3.2.1-full/Dockerfile), [Release 3.2.1](https://github.com/mwz/sonar-scala-docker/releases/tag/3.2.1)
 - `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.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)
 - `2.7.0` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.7.0/Dockerfile), `2.7.0-full` (LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/2.7.0-full/Dockerfile), [Release 2.7.0](https://github.com/mwz/sonar-scala-docker/releases/tag/2.7.0)
@@ -42,6 +43,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.11.0 || 6.8.0 | 
+2.11.0-full | 6.7.6 LTS | 6.8.0 | 
 2.10.0 || 6.7.0 | 
 2.10.0-full | 6.7.6 LTS | 6.7.0 | 
 2.9.0 || 6.6.0 | 
diff --git a/docker-compose-lts.yml b/docker-compose-lts.yml
@@ -1,48 +1,48 @@
 version: "2"
 
 services:
-  sonarqube:
+  sonarqube-lts:
     image: sonarqube:6.7.6-community # lts
     ports:
       - "80:9000"
     networks:
-      - sonarnet
+      - sonarnet_lts
     environment:
       - SONARQUBE_JDBC_USERNAME=sonar
       - SONARQUBE_JDBC_PASSWORD=sonar
-      - SONARQUBE_JDBC_URL=jdbc:postgresql://db:5432/sonar
+      - SONARQUBE_JDBC_URL=jdbc:postgresql://db-lts:5432/sonar
     volumes:
       - ./conf/sonar-lts.properties:/opt/sonarqube/conf/sonar.properties
       - ./logs:/opt/sonarqube/logs
-      - sonarqube_data:/opt/sonarqube/data
-      - sonarqube_bundled-plugins:/opt/sonarqube/lib/bundled-plugins
+      - sonarqube_lts_data:/opt/sonarqube/data
+      - sonarqube_lts_bundled-plugins:/opt/sonarqube/lib/bundled-plugins
     volumes_from:
-      - plugins
+      - plugins-lts
     depends_on:
-      - db
-  db:
+      - db-lts
+  db-lts:
     image: postgres:10.6-alpine
     networks:
-      - sonarnet
+      - sonarnet_lts
     environment:
       - POSTGRES_USER=sonar
       - POSTGRES_PASSWORD=sonar
     volumes:
-      - postgresql:/var/lib/postgresql
-      - postgresql_data:/var/lib/postgresql/data
-  plugins:
-    image: mwizner/sonarqube-scala-plugins:2.10.0
+      - postgresql_lts:/var/lib/postgresql
+      - postgresql_lts_data:/var/lib/postgresql/data
+  plugins-lts:
+    image: mwizner/sonarqube-scala-plugins:2.11.0
     volumes:
-      - sonarqube_plugins:/opt/sonarqube/extensions/plugins
+      - sonarqube_lts_plugins:/opt/sonarqube/extensions/plugins
     command: /bin/true
 
 networks:
-  sonarnet:
+  sonarnet_lts:
     driver: bridge
 
 volumes:
-  sonarqube_data:
-  sonarqube_bundled-plugins:
-  sonarqube_plugins:
-  postgresql:
-  postgresql_data:
+  sonarqube_lts_data:
+  sonarqube_lts_bundled-plugins:
+  sonarqube_lts_plugins:
+  postgresql_lts:
+  postgresql_lts_data:
diff --git a/release-lts.sh b/release-lts.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -eu
 
-export VERSION=2.10.0
-
 # Build
 docker build -t mwizner/sonarqube-scala-plugins:$VERSION $VERSION
 docker build -t mwizner/sonarqube-scala-plugins:$VERSION-full $VERSION-full
diff --git a/vars.js b/vars.js
@@ -7,11 +7,11 @@
     "sonarScala": "7.3.1"
   },
   "lts": {
-    "version": "2.10.0",
+    "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.7.0"
+    "sonarScala": "6.8.0"
   },
   "versions": {
     "current": [
@@ -52,6 +52,13 @@
       }
     ],
     "lts": [
+      {
+        "version": "2.10.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.7.0"
+      },
       {
         "version": "2.9.0",
         "sonar": "6.7.5 LTS",
