Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit e6ee241

Browse files
committed
Sonar-scala 7.2; use the official sonarqube images
1 parent 32fd518 commit e6ee241

File tree

8 files changed

+453
-8
lines changed

8 files changed

+453
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
logs/
12
.idea
23
*.jar

3.2.0-full/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# SonarQube 7.4 image with bundled sonar-scala 7.2.0 (https://github.com/mwz/sonar-scala).
2+
3+
FROM sonarqube:7.4-community
4+
5+
ENV SONAR_SCALA_VERSION 7.2.0
6+
7+
WORKDIR /opt/sonarqube/extensions/plugins
8+
RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
9+
"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"
10+
11+
WORKDIR $SONARQUBE_HOME
12+
ENTRYPOINT ["./bin/run.sh"]

3.2.0/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Alpine image with bundled sonar-scala 7.2.0 (https://github.com/mwz/sonar-scala),
2+
# which can be mounted as a volume into a SonarQube container.
3+
4+
FROM alpine:3.8
5+
6+
ENV SONAR_SCALA_VERSION 7.2.0
7+
8+
RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.8/community wget ca-certificates
9+
10+
WORKDIR /opt/sonarqube/extensions/plugins
11+
RUN wget -O "sonar-scala-plugin-${SONAR_SCALA_VERSION}.jar" \
12+
"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"

conf/sonar.properties

Lines changed: 420 additions & 0 deletions
Large diffs are not rendered by default.

dev/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM alpine:3.8
66

77
ARG SONAR_SCALA_VERSION
88

9-
RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.7/community wget ca-certificates
9+
RUN apk --no-cache add --repository http://dl-cdn.alpinelinux.org/alpine/v3.8/community wget ca-certificates
1010

1111
WORKDIR /opt/sonarqube/extensions/plugins
1212
ADD sonar-scala_2.12-assembly.jar .

dev/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
set -eu
33

4-
export SONAR_SCALA_VERSION=7.2.0-SNAPSHOT
4+
export SONAR_SCALA_VERSION=7.3.0-SNAPSHOT
55
cp ~/.ivy2/local/com.github.mwz/sonar-scala_2.12/${SONAR_SCALA_VERSION}/jars/sonar-scala_2.12-assembly.jar .
66
docker build -t mwizner/sonarqube-scala-plugins:dev --build-arg SONAR_SCALA_VERSION=${SONAR_SCALA_VERSION} .

docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
services:
44
sonarqube:
5-
image: mwizner/sonarqube:7.4-alpine
5+
image: sonarqube:7.4-community
66
ports:
77
- "80:9000"
88
networks:
@@ -12,15 +12,16 @@ services:
1212
- SONARQUBE_JDBC_PASSWORD=sonar
1313
- SONARQUBE_JDBC_URL=jdbc:postgresql://db:5432/sonar
1414
volumes:
15-
- sonarqube_conf:/opt/sonarqube/conf
15+
- ./conf/sonar.properties:/opt/sonarqube/conf/sonar.properties
16+
- ./logs:/opt/sonarqube/logs
1617
- sonarqube_data:/opt/sonarqube/data
1718
- sonarqube_bundled-plugins:/opt/sonarqube/lib/bundled-plugins
1819
volumes_from:
1920
- plugins
2021
depends_on:
2122
- db
2223
db:
23-
image: postgres:10.5-alpine
24+
image: postgres:10.6-alpine
2425
networks:
2526
- sonarnet
2627
environment:
@@ -30,7 +31,7 @@ services:
3031
- postgresql:/var/lib/postgresql
3132
- postgresql_data:/var/lib/postgresql/data
3233
plugins:
33-
image: mwizner/sonarqube-scala-plugins:3.1.0
34+
image: mwizner/sonarqube-scala-plugins:3.2.0
3435
volumes:
3536
- sonarqube_plugins:/opt/sonarqube/extensions/plugins
3637
command: /bin/true
@@ -40,7 +41,6 @@ networks:
4041
driver: bridge
4142

4243
volumes:
43-
sonarqube_conf:
4444
sonarqube_data:
4545
sonarqube_bundled-plugins:
4646
sonarqube_plugins:

release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -eu
33

4-
export VERSION=3.1.0
4+
export VERSION=3.2.0
55

66
# Build
77
docker build -t mwizner/sonarqube-scala-plugins:$VERSION -t mwizner/sonarqube-scala-plugins:latest $VERSION

0 commit comments

Comments
 (0)