Merge branch 'v6.7.7-1'

Dockerfile

@@ -1,18 +1,18 @@
-FROM registry.cloudogu.com/official/java:8u191-1
+FROM registry.cloudogu.com/official/java:8u212-1
 
 LABEL NAME="official/sonar" \
-    VERSION="6.7.6-3" \
+    VERSION="6.7.7-1" \
     maintainer="[email protected]"
 
-ENV SONAR_VERSION=6.7.6 \
+ENV SONAR_VERSION=6.7.7 \
     SONARQUBE_HOME=/opt/sonar \
     # mark as webapp for nginx
     SERVICE_TAGS=webapp \
     CAS_PLUGIN_VERSION=1.0.5
 
 RUN set -x \
     && apk add --no-cache procps postgresql-client \
-    && mkdir /opt \
+    && mkdir -p /opt \
     && cd /tmp \
     && rm -rf /var/cache/apk/* \
     # get SonarQube
@@ -34,4 +34,6 @@ EXPOSE 9000
 
 USER sonar
 
+HEALTHCHECK CMD [ $(curl --silent --fail -u sonarqubedoguadmin:$(doguctl config -e dogu_admin_password) http://localhost:9000/sonar/api/system/health | jq -r '.health') = "GREEN" ] && [ $(doguctl state) == "ready" ] && [ $(doguctl healthy sonar; EXIT_CODE=$?; echo ${EXIT_CODE}) == 0 ]
+
 CMD ["/startup.sh"]

Jenkinsfile

@@ -1,5 +1,5 @@
 #!groovy
-@Library(['github.com/cloudogu/dogu-build-lib@1e5e2a63', 'github.com/cloudogu/zalenium-build-lib@30923630']) _
+@Library(['github.com/cloudogu/dogu-build-lib@414bdfd5', 'github.com/cloudogu/zalenium-build-lib@30923630']) _
 import com.cloudogu.ces.dogubuildlib.*
 
 node('vagrant') {
@@ -22,6 +22,11 @@ node('vagrant') {
             lintDockerfile()
         }
 
+        stage('Shellcheck'){
+            // TODO: Change this to shellCheck("./resources") as soon as https://github.com/cloudogu/dogu-build-lib/issues/8 is solved
+            shellCheck("./resources/post-upgrade.sh ./resources/pre-upgrade.sh ./resources/startup.sh ./resources/upgrade-notification.sh ./resources/util.sh")
+        }
+
         try {
 
             stage('Provision') {
@@ -66,7 +71,7 @@ node('vagrant') {
 
                             dir('integrationTests') {
 
-                                docker.image('node:8.14.0-stretch').inside("-e WEBDRIVER=remote -e CES_FQDN=${externalIP} -e SELENIUM_BROWSER=chrome -e SELENIUM_REMOTE_URL=http://${zaleniumIp}:4444/wd/hub") {
+                                docker.image('node:10.16.3-jessie').inside("-e WEBDRIVER=remote -e CES_FQDN=${externalIP} -e SELENIUM_BROWSER=chrome -e SELENIUM_REMOTE_URL=http://${zaleniumIp}:4444/wd/hub") {
                                     sh 'yarn install'
                                     sh 'yarn run ci-test'
                                 }

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/sonar",
-  "Version": "6.7.6-3",
+  "Version": "6.7.7-1",
   "DisplayName": "SonarQube",
   "Description": "SonarQube is an open source quality management platform, dedicated to continuously analyze and measure source code quality",
   "Category": "Development Apps",

resources/post-upgrade.sh

@@ -12,6 +12,7 @@ set -o pipefail
 # wait_for_sonar_to_get_healthy()
 # create_dogu_admin_and_deactivate_default_admin()
 # set_successful_first_start_flag()
+# shellcheck disable=SC1091
 source util.sh
 
 FROM_VERSION="${1}"

resources/startup.sh

@@ -14,6 +14,7 @@ set -o pipefail
 # create_dogu_admin_and_deactivate_default_admin()
 # set_successful_first_start_flag()
 # DOGU_ADMIN variable
+# shellcheck disable=SC1091
 source util.sh
 
 # export so cas-plugin can use this env variable
@@ -158,7 +159,7 @@ function run_first_start_tasks() {
   set_property_via_rest_api "email.prefix" "[SONARQUBE]" "${DOGU_ADMIN}" "${DOGU_ADMIN_PASSWORD}"
 
   get_out_of_date_plugins_via_rest_api "${DOGU_ADMIN}" "${DOGU_ADMIN_PASSWORD}"
-  if ! [[ -z "${OUT_OF_DATE_PLUGINS}" ]]; then
+  if [[ -n "${OUT_OF_DATE_PLUGINS}" ]]; then
     echo "The following plugins are not up-to-date:"
     echo "${OUT_OF_DATE_PLUGINS}"
     while read -r PLUGIN; do

spec/goss/goss.yaml

@@ -22,7 +22,7 @@ package:
   procps:
     installed: true
     versions:
-    - 3.3.12-r3
+    - 3.3.15-r0
 user:
   sonar:
     exists: true