diff --git a/README.md b/README.md index fc85e56..f3d74ca 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # sonar-scala-docker -[![GitHub version]()](https://github.com/mwz/sonarqube-scala-docker/releases) +[![GitHub version]()](https://github.com/mwz/sonarqube-scala-docker/releases) [![GitHub version lts]()](https://github.com/mwz/sonarqube-scala-docker/releases) [![GitHub version lts 6.7]()](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) @@ -8,7 +8,7 @@ Docker images and docker-compose recipes for out-of-the-box [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts) and -[SonarQube 8.2](https://www.sonarqube.org) instance with support +[SonarQube 8.3.1](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) + @@ -35,7 +35,7 @@ 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:5.2.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)(or +[`mwizner/sonarqube-scala-plugins:5.3.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins)(or `mwizner/sonarqube-scala-plugins:latest-full`) and [`mwizner/sonarqube-scala-plugins:4.2.0-full`](https://hub.docker.com/r/mwizner/sonarqube-scala-plugins) (or `mwizner/sonarqube-scala-plugins:latest-lts-full`) for the current LTS @@ -54,7 +54,7 @@ docker run -d \ -e SONARQUBE_JDBC_USERNAME=sonar \ -e SONARQUBE_JDBC_PASSWORD=sonar \ -e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \ - mwizner/sonarqube-scala-plugins:5.2.0-full + mwizner/sonarqube-scala-plugins:5.3.0-full ``` Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable, @@ -66,14 +66,14 @@ want to try the image, you can use the following command: docker run -d \ --name sonarqube-scala-plugins-full \ -p 80:9000 \ - mwizner/sonarqube-scala-plugins:5.2.0-full + mwizner/sonarqube-scala-plugins:5.3.0-full ``` ## Dependencies - [SonarQube 6.7 LTS](https://hub.docker.com/_/sonarqube) / [SonarQube 7.9 LTS](https://hub.docker.com/_/sonarqube) / - [SonarQube 8.2](https://hub.docker.com/_/sonarqube) + [SonarQube 8.3.1](https://hub.docker.com/_/sonarqube) - [PostgreSQL 11](https://hub.docker.com/_/postgres) - [mwz/sonar-scala](https://github.com/mwz/sonar-scala) - provides support for scalastyle, scoverage and scapegoat @@ -87,7 +87,7 @@ scapegoat support)_ |Version | SonarQube | sonar-scala | |--------|-----------|-------------| -[5.2.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.2.0) | 8.2 [documentation](https://docs.sonarqube.org/8.2), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15301) | [8.2.0](https://github.com/mwz/sonar-scala/releases/tag/v8.2.0) +[5.3.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/5.3.0) | 8.3.1 [documentation](https://docs.sonarqube.org/8.3), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15640) | [8.3.0](https://github.com/mwz/sonar-scala/releases/tag/v8.3.0) [4.2.0](https://github.com/mwz/sonarqube-scala-docker/releases/tag/4.2.0) | 7.9.1 LTS [documentation](https://docs.sonarqube.org/7.9), [changelog](https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15029) | [7.9.0](https://github.com/mwz/sonar-scala/releases/tag/v7.9.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) @@ -101,6 +101,12 @@ scapegoat support)_ sonar-scala sonar-scala-extra + + 5.2.0 + 8.2 documentation, changelog + 8.2.0 + + 5.1.0 8.1 documentation, changelog diff --git a/README_DOCKERHUB.md b/README_DOCKERHUB.md index 7f473fd..ae6f8d0 100644 --- a/README_DOCKERHUB.md +++ b/README_DOCKERHUB.md @@ -1,7 +1,7 @@ Docker images with out-of-the-box [SonarQube 6.7 LTS](https://www.sonarqube.org/sonarqube-6-7-lts), [SonarQube 7.9 LTS](https://www.sonarqube.org/sonarqube-7-9-lts) and -[SonarQube 8.2](https://www.sonarqube.org) instance with support +[SonarQube 8.3.1](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)** + @@ -18,11 +18,11 @@ 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. -- `5.2.0`, `latest` - [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.2.0/Dockerfile), - `5.2.0-full`, `latest-full` - [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.2.0-full/Dockerfile), - [Release 5.2.0](https://github.com/mwz/sonar-scala-docker/releases/tag/5.2.0) +- `5.3.0`, `latest` + [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.3.0/Dockerfile), + `5.3.0-full`, `latest-full` + [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/5.3.0-full/Dockerfile), + [Release 5.3.0](https://github.com/mwz/sonar-scala-docker/releases/tag/5.3.0) - `4.2.0`, `latest-lts` (7.9 LTS) [Dockerfile](https://github.com/mwz/sonar-scala-docker/blob/master/4.2.0/Dockerfile), `4.2.0-full`, `latest-lts-full` (7.9 LTS) @@ -41,8 +41,8 @@ For older versions please check the | Version | SonarQube | sonar-scala | | ------------------------ | ----------------- | ---------------------- | -| 5.2.0 | | 8.2.0 | -| 5.2.0-full | 8.2 | 8.2.0 | +| 5.3.0 | | 8.3.0 | +| 5.3.0-full | 8.3.1 | 8.3.0 | | 4.2.0 | | 7.9.0 | | 4.2.0-full | 7.9.1 LTS | 7.9.0 | | 2.12.0 | | 6.8.0 | @@ -58,7 +58,7 @@ version: "2" services: sonarqube: - image: sonarqube:8.2-community + image: sonarqube:8.3.1-community ports: - "80:9000" networks: @@ -67,7 +67,7 @@ services: - plugins plugins: - image: mwizner/sonarqube-scala-plugins:5.2.0 + image: mwizner/sonarqube-scala-plugins:5.3.0 volumes: - sonarqube_plugins:/opt/sonarqube/extensions/plugins command: /bin/true @@ -95,7 +95,7 @@ docker run -d \ -e SONARQUBE_JDBC_USERNAME=sonar \ -e SONARQUBE_JDBC_PASSWORD=sonar \ -e SONARQUBE_JDBC_URL=jdbc:postgresql://localhost/sonar \ - mwizner/sonarqube-scala-plugins:5.2.0-full + mwizner/sonarqube-scala-plugins:5.3.0-full ``` Please note that if you don't specify the `SONARQUBE_JDBC_URL` variable, @@ -107,7 +107,7 @@ want to try the image, you can use the following command: docker run -d \ --name sonarqube-scala-plugins-full \ -p 80:9000 \ - mwizner/sonarqube-scala-plugins:5.2.0-full + mwizner/sonarqube-scala-plugins:5.3.0-full ``` ## Repository diff --git a/current/Dockerfile b/current/Dockerfile index 2617abc..be16a53 100644 --- a/current/Dockerfile +++ b/current/Dockerfile @@ -4,10 +4,14 @@ FROM bitnami/minideb:stretch RUN install_packages curl ca-certificates -ENV SONAR_SCALA_VERSION 8.2.0 +ENV SONAR_SCALA_VERSION 8.3.0 +ENV GIT_PLUGIN_VERSION 1.11.1.2008 +ENV SQ_EXTENSIONS_DIR "/opt/sonarqube/extensions" -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.13/${SONAR_SCALA_VERSION}/sonar-scala_2.13-${SONAR_SCALA_VERSION}-assembly.jar" -RUN chown -R sonarqube:sonarqube /opt/sonarqube +RUN groupadd -g 1000 -r sonarqube && useradd -r -g sonarqube sonarqube +RUN curl --create-dirs -L -o "${SQ_EXTENSIONS_DIR}/plugins/sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \ + "https://dl.bintray.com/mwz/maven/com/github/mwz/sonar-scala_2.13/${SONAR_SCALA_VERSION}/sonar-scala_2.13-${SONAR_SCALA_VERSION}-assembly.jar" && \ + curl --create-dirs -L -o "${SQ_EXTENSIONS_DIR}/plugins/sonar-scm-git-plugin-${GIT_PLUGIN_VERSION}.jar" \ + "https://repo1.maven.org/maven2/org/sonarsource/scm/git/sonar-scm-git-plugin/${GIT_PLUGIN_VERSION}/sonar-scm-git-plugin-${GIT_PLUGIN_VERSION}.jar" && \ + chown -R sonarqube:sonarqube /opt/sonarqube && \ + chmod 777 $SQ_EXTENSIONS_DIR/plugins/* diff --git a/current/full/Dockerfile b/current/full/Dockerfile index cd31e8e..64933b6 100644 --- a/current/full/Dockerfile +++ b/current/full/Dockerfile @@ -1,12 +1,14 @@ -# SonarQube 8.2 image with bundled sonar-scala (https://github.com/mwz/sonar-scala). +# SonarQube 8.3 image with bundled sonar-scala (https://github.com/mwz/sonar-scala). -FROM sonarqube:8.2-community +FROM sonarqube:8.3.1-community -ENV SONAR_SCALA_VERSION 8.2.0 +ENV SONAR_SCALA_VERSION 8.3.0 -WORKDIR /opt/sonarqube/extensions/plugins -RUN rm sonar-scala-plugin-* && curl -L -o "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \ - "https://dl.bintray.com/mwz/maven/com/github/mwz/sonar-scala_2.13/${SONAR_SCALA_VERSION}/sonar-scala_2.13-${SONAR_SCALA_VERSION}-assembly.jar" +RUN rm $SQ_EXTENSIONS_DIR/plugins/sonar-scala-plugin-* && \ + wget -O "${SQ_EXTENSIONS_DIR}/plugins/sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \ + "https://dl.bintray.com/mwz/maven/com/github/mwz/sonar-scala_2.13/${SONAR_SCALA_VERSION}/sonar-scala_2.13-${SONAR_SCALA_VERSION}-assembly.jar" && \ + chown sonarqube:sonarqube $SQ_EXTENSIONS_DIR/plugins/sonar-scala-plugin-* && \ + chmod 777 $SQ_EXTENSIONS_DIR/plugins/sonar-scala-plugin-* WORKDIR $SONARQUBE_HOME ENTRYPOINT ["./bin/run.sh"] diff --git a/dev/Dockerfile b/dev/Dockerfile index f91dd6d..e543f88 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -6,6 +6,6 @@ FROM bitnami/minideb:stretch ARG SONAR_SCALA_VERSION -RUN groupadd -r sonarqube && useradd -r -g sonarqube sonarqube +RUN groupadd -g 1000 -r sonarqube && useradd -r -g sonarqube sonarqube ADD --chown=sonarqube:sonarqube sonar-scala_2.13-assembly.jar /opt/sonarqube/extensions/plugins/sonar-scala_2.13-assembly.jar WORKDIR /opt/sonarqube/extensions/plugins diff --git a/dev/build.sh b/dev/build.sh index eec4df6..450d9a6 100755 --- a/dev/build.sh +++ b/dev/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -eu -export SONAR_SCALA_VERSION=8.3.0-SNAPSHOT +export SONAR_SCALA_VERSION=8.4.0-SNAPSHOT cp ~/.ivy2/local/com.github.mwz/sonar-scala_2.13/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.13-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 index 1a5a2c2..c3951d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: sonarqube: - image: sonarqube:8.2-community + image: sonarqube:8.3.1-community ports: - "80:9000" networks: diff --git a/vars.json b/vars.json index f291fba..66e2d0e 100644 --- a/vars.json +++ b/vars.json @@ -1,10 +1,10 @@ { "current": { - "version": "5.2.0", - "sonar": "8.2", - "sonarDocs": "https://docs.sonarqube.org/8.2", - "sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15301", - "sonarScala": "8.2.0" + "version": "5.3.0", + "sonar": "8.3.1", + "sonarDocs": "https://docs.sonarqube.org/8.3", + "sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15640", + "sonarScala": "8.3.0" }, "lts": { "version": "4.2.0", @@ -22,6 +22,13 @@ }, "versions": { "current": [ + { + "version": "5.2.0", + "sonar": "8.2", + "sonarDocs": "https://docs.sonarqube.org/8.2", + "sonarChangelog": "https://jira.sonarsource.com/secure/ReleaseNote.jspa?projectId=10930&version=15301", + "sonarScala": "8.2.0" + }, { "version": "5.1.0", "sonar": "8.1",