diff --git a/bitnami/sonarqube/9/debian-11/Dockerfile b/bitnami/sonarqube/9/debian-11/Dockerfile index a2dc7a3ed0b6..1627135508b8 100644 --- a/bitnami/sonarqube/9/debian-11/Dockerfile +++ b/bitnami/sonarqube/9/debian-11/Dockerfile @@ -6,7 +6,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="9.8.0-debian-11-r13" \ + org.opencontainers.image.ref.name="9.8.0-debian-11-r14" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/sonarqube" \ org.opencontainers.image.title="sonarqube" \ org.opencontainers.image.vendor="VMware, Inc." \ diff --git a/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh b/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh index 77492c807fbd..ef0d45b76822 100644 --- a/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh +++ b/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/libsonarqube.sh @@ -204,9 +204,9 @@ EOF restore_persisted_app "$app_name" "$SONARQUBE_DATA_TO_PERSIST" fi - # Check and move provisioned extensions from mounted provisioning directory to application extensions directory + # Check and move provisioned content from mounted provisioning directory to application directory if ! is_mounted_dir_empty "$SONARQUBE_MOUNTED_PROVISIONING_DIR"; then - info "Found mounted extensions provisioning directory" + info "Found mounted provisioning directory" sonarqube_copy_mounted_config fi @@ -395,8 +395,8 @@ sonarqube_stop() { ######################### sonarqube_copy_mounted_config() { if ! is_dir_empty "$SONARQUBE_MOUNTED_PROVISIONING_DIR"; then - if ! cp -Lr "${SONARQUBE_MOUNTED_PROVISIONING_DIR}"/* "${SONARQUBE_EXTENSIONS_DIR}"; then - error "Issue copying mounted configuration files from $SONARQUBE_MOUNTED_PROVISIONING_DIR to $SONARQUBE_EXTENSIONS_DIR. Make sure you are not mounting configuration files in $SONARQUBE_MOUNTED_PROVISIONING_DIR and $SONARQUBE_EXTENSIONS_DIR at the same time" + if ! cp -Lr "${SONARQUBE_MOUNTED_PROVISIONING_DIR}"/* "${SONARQUBE_BASE_DIR}"; then + error "Issue copying mounted configuration files from $SONARQUBE_MOUNTED_PROVISIONING_DIR to $SONARQUBE_BASE_DIR. Make sure you are not mounting configuration files in $SONARQUBE_MOUNTED_PROVISIONING_DIR and $SONARQUBE_BASE_DIR at the same time" exit 1 fi fi diff --git a/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/sonarqube-env.sh b/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/sonarqube-env.sh index 82e54b5a2223..19f4f62e2230 100644 --- a/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/sonarqube-env.sh +++ b/bitnami/sonarqube/9/debian-11/rootfs/opt/bitnami/scripts/sonarqube-env.sh @@ -79,7 +79,7 @@ unset sonarqube_env_vars export SONARQUBE_BASE_DIR="${BITNAMI_ROOT_DIR}/sonarqube" export SONARQUBE_DATA_DIR="${SONARQUBE_BASE_DIR}/data" export SONARQUBE_EXTENSIONS_DIR="${SONARQUBE_BASE_DIR}/extensions" -export SONARQUBE_MOUNTED_PROVISIONING_DIR="${SONARQUBE_MOUNTED_PROVISIONING_DIR:-/bitnami/sonarqube-extensions}" +export SONARQUBE_MOUNTED_PROVISIONING_DIR="${SONARQUBE_MOUNTED_PROVISIONING_DIR:-/bitnami/sonarqube-provisioning}" export SONARQUBE_CONF_DIR="${SONARQUBE_BASE_DIR}/conf" export SONARQUBE_CONF_FILE="${SONARQUBE_CONF_DIR}/sonar.properties" export SONARQUBE_LOGS_DIR="${SONARQUBE_BASE_DIR}/logs"