Skip to content

Commit

Permalink
Merge pull request #74 from ekino/add_sonarqube
Browse files Browse the repository at this point in the history
feat(sonar): add sonar files and refactor travis.py file
  • Loading branch information
rande authored Nov 1, 2017
2 parents 12b6b43 + 736ae43 commit 015a583
Show file tree
Hide file tree
Showing 6 changed files with 266 additions and 178 deletions.
17 changes: 9 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@ services:

matrix:
include:
- env: LANGUAGE=node VERSION=6.11 MODD_VERSION=0.4 NODE_VERSION=6.11.3
- env: LANGUAGE=node VERSION=7.10 MODD_VERSION=0.4 NODE_VERSION=7.10.1
- env: LANGUAGE=node VERSION=8.6 MODD_VERSION=0.4 NODE_VERSION=8.6.0
- env: LANGUAGE=java VERSION=8 MODD_VERSION=0.4 JAVA_VERSION=8u144-1~webupd8~0
- env: LANGUAGE=php VERSION=5.3 MODD_VERSION=0.4 PHP_VERSION=5.3.10 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11 REDIS_VERSION=3.1.4
- env: LANGUAGE=php VERSION=5.6 MODD_VERSION=0.4 PHP_VERSION=5.6.31 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11 REDIS_VERSION=3.1.4
- env: LANGUAGE=php VERSION=7.1 MODD_VERSION=0.4 PHP_VERSION=7.1.9 PHP_BUILD_INSTALL_EXTENSION=apcu=5.1.8 REDIS_VERSION=3.1.4
- env: LANGUAGE=node VERSION=6.11 NODE_VERSION=6.11.3
- env: LANGUAGE=node VERSION=7.10 NODE_VERSION=7.10.1
- env: LANGUAGE=node VERSION=8.6 NODE_VERSION=8.6.0
- env: LANGUAGE=java VERSION=8 JAVA_VERSION=8u151-1~webupd8~0
- env: LANGUAGE=php VERSION=5.3 PHP_VERSION=5.3.10 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11 REDIS_VERSION=3.1.4
- env: LANGUAGE=php VERSION=5.6 PHP_VERSION=5.6.31 PHP_BUILD_INSTALL_EXTENSION=apcu=4.0.11 REDIS_VERSION=3.1.4
- env: LANGUAGE=php VERSION=7.1 PHP_VERSION=7.1.9 PHP_BUILD_INSTALL_EXTENSION=apcu=5.1.8 REDIS_VERSION=3.1.4
- env: LANGUAGE=aws VERSION=1
- env: LANGUAGE=dind-aws VERSION=1 DOCKER_COMPOSE_VERSION=1.16.1
- env: LANGUAGE=golang VERSION=1.9 MODD_VERSION=0.4 GLIDE_VERSION=v0.13.0
- env: LANGUAGE=golang VERSION=1.9 GLIDE_VERSION=v0.13.0
- env: LANGUAGE=ruby VERSION=2.4
- env: LANGUAGE=ansible VERSION=2.3.0.0-r1 PYTHON_VERSION=2.7.13-r1 GLIBC_VERSION=2.26-r0
- env: LANGUAGE=sonar VERSION=3.0 SONARSCANNER_VERSION=3.0.3.778

script:
- travis_wait python travis.py
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Versions
========

2017-10-13
2017-11-01
----------

* BC break: dind-aws image is now based on Alpine
* Upgrade Docker version to 17.09 and Docker Compose to 1.16.1 in dind-aws image
* Upgrade Java version: 8u144
* Upgrade Java version: 8u151-1~webupd8~0
* Upgrade PHP version: 5.6.31, 7.1.9
* Upgrade PHP Redis: 3.1.4
* Add Node 8.6
Expand All @@ -15,6 +15,7 @@ Versions
* Upgrade golang: 1.9
* Upgrade Glide: 0.13.0
* Add Ansible: 2.2.3.0
* Add Sonar Scanner: 3.0.3.778

2017-07-17
----------
Expand Down
7 changes: 0 additions & 7 deletions Makefile

This file was deleted.

9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ Contains Ruby (installed from official alpine) and CI Helper.

Contains Ansible, CI Helper and Python 2.7

### SonarQube Scanner

Contains SonarQube Scanner and CI Helper


## Versions

Please review the [CHANGELOG.md](CHANGELOG.md) file for versions per tag.
Expand All @@ -52,3 +57,7 @@ The ``travis.py`` script try to be clever:
- Nightly: all images are built and pushed to the docker registry with the tag ``nightly-IMAGE``

[![Build Status](https://travis-ci.org/ekino/docker-buildbox.svg?branch=master)](https://travis-ci.org/ekino/docker-buildbox)

It is possible to build local image for testing with the following command:

SONARSCANNER_VERSION=3.0.3.778 VERSION=3.0 python travis.py --language sonar --pull-request=true
32 changes: 32 additions & 0 deletions sonar/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM alpine:3.4

ARG SONARSCANNER_VERSION

ENV PATH=/sonar-scanner/bin:/sonar-scanner/jre/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

ARG SONARSCANNER_VERSION
ARG CI_HELPER_VERSION

RUN echo "Starting ..." && \
apk --update upgrade && apk add curl unzip make && \
echo "Done base install!" && \

echo "Starting Sonar Scanner" && \
curl --insecure -o ./sonarscanner.zip -L https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONARSCANNER_VERSION}-linux.zip && \
unzip sonarscanner.zip && \
rm sonarscanner.zip && \
mv sonar-scanner-${SONARSCANNER_VERSION}-linux sonar-scanner && \
echo "Done Sonar Scanner!" && \

echo "Install CI Helper" && \
curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
curl -sSL https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk -O && \
apk add -q glibc-2.23-r3.apk && \
rm /etc/apk/keys/sgerrand.rsa.pub glibc-2.23-r3.apk && \
curl -sSL https://github.com/rande/gitlab-ci-helper/releases/download/${CI_HELPER_VERSION}/linux-amd64-gitlab-ci-helper -o /usr/bin/ci-helper && \
chmod 755 /usr/bin/ci-helper && \
echo "Done install CI Helper" && \

echo "Cleaning files!" && \
rm -rf /tmp/* /var/cache/apk/* && \
echo "Done!"
Loading

0 comments on commit 015a583

Please sign in to comment.