Release SonarQube 8.9.7 #11806
Merged
Release SonarQube 8.9.7 #11806
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for b14db52:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7aff16a..4220592 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,6 +1,21 @@
Maintainers: Christophe Levis <christophe.levis@sonarsource.com> (@christophelevis), Pierre Guillot <pierre.guillot@sonarsource.com> (@pierre-guillot-sonarsource), Tobias Trabelsi <tobias.trabelsi@sonarsource.com> (@tobias-trabelsi-sonarsource), Lukasz Jarocki <lukasz.jarocki@sonarsource.com> (@lukasz-jarocki-sonarsource)
GitRepo: https://github.com/SonarSource/docker-sonarqube.git
-GitCommit: 4a9e01cbeeaf454233731c28585891b71baa1540
+GitCommit: 3f19b396006f2a8466854cae90329a55692fa073
+
+Tags: 8.9.7-community, 8.9-community, 8-community, lts, lts-community
+Directory: 8/community
+
+Tags: 8.9.7-datacenter-app, 8.9-datacenter-app, 8-datacenter-app, lts-datacenter-app
+Directory: 8/datacenter/app
+
+Tags: 8.9.7-datacenter-search, 8.9-datacenter-search, 8-datacenter-search, lts-datacenter-search
+Directory: 8/datacenter/search
+
+Tags: 8.9.7-developer, 8.9-developer, 8-developer, lts-developer
+Directory: 8/developer
+
+Tags: 8.9.7-enterprise, 8.9-enterprise, 8-enterprise, lts-enterprise
+Directory: 8/enterprise
Tags: 9.3.0-community, 9.3-community, 9-community, community, latest
Directory: 9/community
diff --git a/_bashbrew-list b/_bashbrew-list
index 682d737..589cfd4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,3 +1,18 @@
+sonarqube:8-community
+sonarqube:8-datacenter-app
+sonarqube:8-datacenter-search
+sonarqube:8-developer
+sonarqube:8-enterprise
+sonarqube:8.9-community
+sonarqube:8.9-datacenter-app
+sonarqube:8.9-datacenter-search
+sonarqube:8.9-developer
+sonarqube:8.9-enterprise
+sonarqube:8.9.7-community
+sonarqube:8.9.7-datacenter-app
+sonarqube:8.9.7-datacenter-search
+sonarqube:8.9.7-developer
+sonarqube:8.9.7-enterprise
sonarqube:9-community
sonarqube:9-datacenter-app
sonarqube:9-datacenter-search
@@ -19,3 +34,9 @@ sonarqube:datacenter-search
sonarqube:developer
sonarqube:enterprise
sonarqube:latest
+sonarqube:lts
+sonarqube:lts-community
+sonarqube:lts-datacenter-app
+sonarqube:lts-datacenter-search
+sonarqube:lts-developer
+sonarqube:lts-enterprise
diff --git a/sonarqube_latest/Dockerfile b/sonarqube_lts-community/Dockerfile
similarity index 34%
copy from sonarqube_latest/Dockerfile
copy to sonarqube_lts-community/Dockerfile
index eb89aa4..2addcf7 100644
--- a/sonarqube_latest/Dockerfile
+++ b/sonarqube_lts-community/Dockerfile
@@ -1,15 +1,94 @@
-FROM alpine:3.14
+FROM alpine:3.12
-ENV LANG='en_US.UTF-8' \
+ENV JAVA_VERSION="jdk-11.0.11+9" \
+ LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
+#
+# glibc setup
+#
+RUN set -eux; \
+ apk add --no-cache tzdata --virtual .build-deps curl binutils zstd; \
+ GLIBC_VER="2.33-r0"; \
+ ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download"; \
+ GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.2.0-6-x86_64.pkg.tar.zst"; \
+ GCC_LIBS_SHA256="e33b45e4a10ef26259d6acf8e7b5dd6dc63800641e41eb67fa6588d061f79c1c"; \
+ ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.11-4-x86_64.pkg.tar.xz"; \
+ ZLIB_SHA256=43a17987d348e0b395cb6e28d2ece65fb3b5a0fe433714762780d18c0451c149; \
+ curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub; \
+ SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2"; \
+ echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - ; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ /usr/glibc-compat/bin/localedef --inputfile en_US --charmap UTF-8 "$LANG" || true ;\
+ echo "export LANG=$LANG" > /etc/profile.d/locale.sh; \
+ curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.zst; \
+ echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.zst" | sha256sum -c - ; \
+ mkdir /tmp/gcc; \
+ zstd -d /tmp/gcc-libs.tar.zst --output-dir-flat /tmp; \
+ tar -xf /tmp/gcc-libs.tar -C /tmp/gcc; \
+ mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib; \
+ strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so*; \
+ curl -LfsS ${ZLIB_URL} -o /tmp/libz.tar.xz; \
+ echo "${ZLIB_SHA256} */tmp/libz.tar.xz" | sha256sum -c - ;\
+ mkdir /tmp/libz; \
+ tar -xf /tmp/libz.tar.xz -C /tmp/libz; \
+ mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib; \
+ apk del --purge .build-deps glibc-i18n; \
+ rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
+
+#
+# Adoptium openjdk11 setup
+#
+RUN set -eux; \
+ apk add --no-cache --virtual .fetch-deps curl; \
+ ARCH="$(apk --print-arch)"; \
+ case "${ARCH}" in \
+ aarch64|arm64) \
+ ESUM='76f7da05d905b5f9de8de1a34c1a206744f7589bf0eed876cd9069cb1d913806'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ armhf|armv7l) \
+ ESUM='aee2f20d005b58e79c3c6c02271f797cb387d33a135b762886990b9bf7cb262e'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ ppc64el|ppc64le) \
+ ESUM='8f267876675dac3da3f4ceccd44d812b57098505eeec5fb1688d54bdeffcd1da'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ s390x) \
+ ESUM='b4a5af4ffcc98f6b7cdd2232f79aa12f20efa769b5255277fa4974e2e19d4409'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ amd64|x86_64) \
+ ESUM='fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ *) \
+ echo "Unsupported arch: ${ARCH}"; \
+ exit 1; \
+ ;; \
+ esac; \
+ curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+ mkdir -p /opt/java/openjdk; \
+ cd /opt/java/openjdk; \
+ tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+ apk del --purge .fetch-deps; \
+ rm -rf /var/cache/apk/*; \
+ rm -rf /tmp/openjdk.tar.gz;
+
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.3.0.51899
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${SONARQUBE_VERSION}.zip
-ENV JAVA_HOME='/usr/lib/jvm/java-11-openjdk' \
+ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
SONARQUBE_HOME=/opt/sonarqube \
SONAR_VERSION="${SONARQUBE_VERSION}" \
@@ -22,7 +101,7 @@ RUN set -eux; \
addgroup -S -g 1000 sonarqube; \
adduser -S -D -u 1000 -G sonarqube sonarqube; \
apk add --no-cache --virtual build-dependencies gnupg unzip curl; \
- apk add --no-cache bash su-exec ttf-dejavu openjdk11-jre; \
+ apk add --no-cache bash su-exec ttf-dejavu; \
# pub 2048R/D26468DE 2015-05-25
# Key fingerprint = F118 2E81 C792 9289 21DB CAB4 CFCA 4A29 D264 68DE
# uid sonarsource_deployer (Sonarsource Deployer) <infra@sonarsource.com>
@@ -54,8 +133,5 @@ COPY --chown=sonarqube:sonarqube run.sh sonar.sh ${SONARQUBE_HOME}/bin/
WORKDIR ${SONARQUBE_HOME}
EXPOSE 9000
-
-STOPSIGNAL SIGINT
-
-ENTRYPOINT ["/opt/sonarqube/bin/run.sh"]
-CMD ["/opt/sonarqube/bin/sonar.sh"]
+ENTRYPOINT ["bin/run.sh"]
+CMD ["bin/sonar.sh"]
diff --git a/sonarqube_developer/run.sh b/sonarqube_lts-community/run.sh
similarity index 92%
copy from sonarqube_developer/run.sh
copy to sonarqube_lts-community/run.sh
index b4935e1..ebb36e8 100755
--- a/sonarqube_developer/run.sh
+++ b/sonarqube_lts-community/run.sh
@@ -11,22 +11,21 @@ set_prop_from_deprecated_env_var() {
# if nothing is passed, assume we want to run sonarqube server
if [ "$#" == 0 ]; then
- set -- /opt/sonarqube/bin/sonar.sh
+ set -- bin/sonar.sh
fi
# if first arg looks like a flag, assume we want to run sonarqube server with flags
if [ "${1:0:1}" = '-' ]; then
- set -- /opt/sonarqube/bin/sonar.sh "$@"
+ set -- bin/sonar.sh "$@"
fi
-if [[ "$1" = '/opt/sonarqube/bin/sonar.sh' ]]; then
+if [[ "$1" = 'bin/sonar.sh' ]]; then
chown -R "$(id -u):$(id -g)" "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
chmod -R 700 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
# Allow the container to be started with `--user`
if [[ "$(id -u)" = '0' ]]; then
chown -R sonarqube:sonarqube "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"
- echo "Dropping Privileges"
exec su-exec sonarqube "$0" "$@"
fi
diff --git a/sonarqube_developer/sonar.sh b/sonarqube_lts-community/sonar.sh
similarity index 100%
copy from sonarqube_developer/sonar.sh
copy to sonarqube_lts-community/sonar.sh
diff --git a/sonarqube_datacenter-app/Dockerfile b/sonarqube_lts-datacenter-app/Dockerfile
similarity index 35%
copy from sonarqube_datacenter-app/Dockerfile
copy to sonarqube_lts-datacenter-app/Dockerfile
index 1018f4a..607c6a5 100644
--- a/sonarqube_datacenter-app/Dockerfile
+++ b/sonarqube_lts-datacenter-app/Dockerfile
@@ -1,15 +1,94 @@
-FROM alpine:3.14
+FROM alpine:3.12
-ENV LANG='en_US.UTF-8' \
+ENV JAVA_VERSION="jdk-11.0.10+9" \
+ LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
+#
+# glibc setup
+#
+RUN set -eux; \
+ apk add --no-cache tzdata --virtual .build-deps curl binutils zstd; \
+ GLIBC_VER="2.33-r0"; \
+ ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download"; \
+ GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.2.0-6-x86_64.pkg.tar.zst"; \
+ GCC_LIBS_SHA256="e33b45e4a10ef26259d6acf8e7b5dd6dc63800641e41eb67fa6588d061f79c1c"; \
+ ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.11-4-x86_64.pkg.tar.xz"; \
+ ZLIB_SHA256=43a17987d348e0b395cb6e28d2ece65fb3b5a0fe433714762780d18c0451c149; \
+ curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub; \
+ SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2"; \
+ echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - ; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ /usr/glibc-compat/bin/localedef --inputfile en_US --charmap UTF-8 "$LANG" || true ;\
+ echo "export LANG=$LANG" > /etc/profile.d/locale.sh; \
+ curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.zst; \
+ echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.zst" | sha256sum -c - ; \
+ mkdir /tmp/gcc; \
+ zstd -d /tmp/gcc-libs.tar.zst --output-dir-flat /tmp; \
+ tar -xf /tmp/gcc-libs.tar -C /tmp/gcc; \
+ mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib; \
+ strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so*; \
+ curl -LfsS ${ZLIB_URL} -o /tmp/libz.tar.xz; \
+ echo "${ZLIB_SHA256} */tmp/libz.tar.xz" | sha256sum -c - ;\
+ mkdir /tmp/libz; \
+ tar -xf /tmp/libz.tar.xz -C /tmp/libz; \
+ mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib; \
+ apk del --purge .build-deps glibc-i18n; \
+ rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
+
+#
+# Adoptium openjdk11 setup
+#
+RUN set -eux; \
+ apk add --no-cache --virtual .fetch-deps curl; \
+ ARCH="$(apk --print-arch)"; \
+ case "${ARCH}" in \
+ aarch64|arm64) \
+ ESUM='76f7da05d905b5f9de8de1a34c1a206744f7589bf0eed876cd9069cb1d913806'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ armhf|armv7l) \
+ ESUM='aee2f20d005b58e79c3c6c02271f797cb387d33a135b762886990b9bf7cb262e'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ ppc64el|ppc64le) \
+ ESUM='8f267876675dac3da3f4ceccd44d812b57098505eeec5fb1688d54bdeffcd1da'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ s390x) \
+ ESUM='b4a5af4ffcc98f6b7cdd2232f79aa12f20efa769b5255277fa4974e2e19d4409'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ amd64|x86_64) \
+ ESUM='fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ *) \
+ echo "Unsupported arch: ${ARCH}"; \
+ exit 1; \
+ ;; \
+ esac; \
+ curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+ mkdir -p /opt/java/openjdk; \
+ cd /opt/java/openjdk; \
+ tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+ apk del --purge .fetch-deps; \
+ rm -rf /var/cache/apk/*; \
+ rm -rf /tmp/openjdk.tar.gz;
+
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.3.0.51899
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
-ENV JAVA_HOME='/usr/lib/jvm/java-11-openjdk' \
+ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
SONARQUBE_HOME=/opt/sonarqube \
SONAR_VERSION="${SONARQUBE_VERSION}" \
@@ -24,7 +103,7 @@ RUN set -eux; \
addgroup -S -g 1000 sonarqube; \
adduser -S -D -u 1000 -G sonarqube sonarqube; \
apk add --no-cache --virtual build-dependencies gnupg unzip curl; \
- apk add --no-cache bash su-exec ttf-dejavu openjdk11-jre; \
+ apk add --no-cache bash su-exec ttf-dejavu; \
# pub 2048R/D26468DE 2015-05-25
# Key fingerprint = F118 2E81 C792 9289 21DB CAB4 CFCA 4A29 D264 68DE
# uid sonarsource_deployer (Sonarsource Deployer) <infra@sonarsource.com>
@@ -56,8 +135,5 @@ COPY --chown=sonarqube:sonarqube run.sh sonar.sh ${SONARQUBE_HOME}/bin/
WORKDIR ${SONARQUBE_HOME}
EXPOSE 9000
-
-STOPSIGNAL SIGINT
-
-ENTRYPOINT ["/opt/sonarqube/bin/run.sh"]
-CMD ["/opt/sonarqube/bin/sonar.sh"]
+ENTRYPOINT ["bin/run.sh"]
+CMD ["bin/sonar.sh"]
diff --git a/sonarqube_datacenter-app/run.sh b/sonarqube_lts-datacenter-app/run.sh
similarity index 94%
copy from sonarqube_datacenter-app/run.sh
copy to sonarqube_lts-datacenter-app/run.sh
index 4ba85ca..d733cc2 100755
--- a/sonarqube_datacenter-app/run.sh
+++ b/sonarqube_lts-datacenter-app/run.sh
@@ -14,22 +14,21 @@ set_prop_from_deprecated_env_var() {
# if nothing is passed, assume we want to run sonarqube server
if [ "$#" == 0 ]; then
- set -- /opt/sonarqube/bin/sonar.sh
+ set -- bin/sonar.sh
fi
# if first arg looks like a flag, assume we want to run sonarqube server with flags
if [ "${1:0:1}" = '-' ]; then
- set -- /opt/sonarqube/bin/sonar.sh "$@"
+ set -- bin/sonar.sh "$@"
fi
-if [[ "$1" = '/opt/sonarqube/bin/sonar.sh' ]]; then
+if [[ "$1" = 'bin/sonar.sh' ]]; then
chown -R "$(id -u):$(id -g)" "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
chmod -R 700 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
# Allow the container to be started with `--user`
if [[ "$(id -u)" = '0' ]]; then
chown -R sonarqube:sonarqube "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"
- echo "Dropping Privileges"
exec su-exec sonarqube "$0" "$@"
fi
diff --git a/sonarqube_developer/sonar.sh b/sonarqube_lts-datacenter-app/sonar.sh
similarity index 100%
copy from sonarqube_developer/sonar.sh
copy to sonarqube_lts-datacenter-app/sonar.sh
diff --git a/sonarqube_datacenter-search/Dockerfile b/sonarqube_lts-datacenter-search/Dockerfile
similarity index 35%
copy from sonarqube_datacenter-search/Dockerfile
copy to sonarqube_lts-datacenter-search/Dockerfile
index 843f263..f0c19b7 100644
--- a/sonarqube_datacenter-search/Dockerfile
+++ b/sonarqube_lts-datacenter-search/Dockerfile
@@ -1,15 +1,93 @@
-FROM alpine:3.14
+FROM alpine:3.12
-ENV LANG='en_US.UTF-8' \
+ENV JAVA_VERSION="jdk-11.0.10+9" \
+ LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
+#
+# glibc setup
+#
+RUN set -eux; \
+ apk add --no-cache tzdata --virtual .build-deps curl binutils zstd; \
+ GLIBC_VER="2.33-r0"; \
+ ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download"; \
+ GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.2.0-6-x86_64.pkg.tar.zst"; \
+ GCC_LIBS_SHA256="e33b45e4a10ef26259d6acf8e7b5dd6dc63800641e41eb67fa6588d061f79c1c"; \
+ ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.11-4-x86_64.pkg.tar.xz"; \
+ ZLIB_SHA256=43a17987d348e0b395cb6e28d2ece65fb3b5a0fe433714762780d18c0451c149; \
+ curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub; \
+ SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2"; \
+ echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - ; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ /usr/glibc-compat/bin/localedef --inputfile en_US --charmap UTF-8 "$LANG" || true ;\
+ echo "export LANG=$LANG" > /etc/profile.d/locale.sh; \
+ curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.zst; \
+ echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.zst" | sha256sum -c - ; \
+ mkdir /tmp/gcc; \
+ zstd -d /tmp/gcc-libs.tar.zst --output-dir-flat /tmp; \
+ tar -xf /tmp/gcc-libs.tar -C /tmp/gcc; \
+ mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib; \
+ strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so*; \
+ curl -LfsS ${ZLIB_URL} -o /tmp/libz.tar.xz; \
+ echo "${ZLIB_SHA256} */tmp/libz.tar.xz" | sha256sum -c - ;\
+ mkdir /tmp/libz; \
+ tar -xf /tmp/libz.tar.xz -C /tmp/libz; \
+ mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib; \
+ apk del --purge .build-deps glibc-i18n; \
+ rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
+#
+# AdoptOpenJDK/openjdk11 setup
+#
+RUN set -eux; \
+ apk add --no-cache --virtual .fetch-deps curl; \
+ ARCH="$(apk --print-arch)"; \
+ case "${ARCH}" in \
+ aarch64|arm64) \
+ ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \
+ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ;; \
+ armhf|armv7l) \
+ ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \
+ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \
+ ;; \
+ ppc64el|ppc64le) \
+ ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \
+ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \
+ ;; \
+ s390x) \
+ ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \
+ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \
+ ;; \
+ amd64|x86_64) \
+ ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \
+ BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ;; \
+ *) \
+ echo "Unsupported arch: ${ARCH}"; \
+ exit 1; \
+ ;; \
+ esac; \
+ curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+ mkdir -p /opt/java/openjdk; \
+ cd /opt/java/openjdk; \
+ tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+ apk del --purge .fetch-deps; \
+ rm -rf /var/cache/apk/*; \
+ rm -rf /tmp/openjdk.tar.gz;
+
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.3.0.51899
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
-ENV JAVA_HOME='/usr/lib/jvm/java-11-openjdk' \
+ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
SONARQUBE_HOME=/opt/sonarqube \
SONAR_VERSION="${SONARQUBE_VERSION}" \
@@ -24,7 +102,7 @@ RUN set -eux; \
addgroup -S -g 1000 sonarqube; \
adduser -S -D -u 1000 -G sonarqube sonarqube; \
apk add --no-cache --virtual build-dependencies gnupg unzip curl; \
- apk add --no-cache bash su-exec ttf-dejavu openjdk11-jre; \
+ apk add --no-cache bash su-exec ttf-dejavu; \
# pub 2048R/D26468DE 2015-05-25
# Key fingerprint = F118 2E81 C792 9289 21DB CAB4 CFCA 4A29 D264 68DE
# uid sonarsource_deployer (Sonarsource Deployer) <infra@sonarsource.com>
@@ -56,8 +134,5 @@ COPY --chown=sonarqube:sonarqube run.sh sonar.sh ${SONARQUBE_HOME}/bin/
WORKDIR ${SONARQUBE_HOME}
EXPOSE 9000
-
-STOPSIGNAL SIGINT
-
-ENTRYPOINT ["/opt/sonarqube/bin/run.sh"]
-CMD ["/opt/sonarqube/bin/sonar.sh"]
+ENTRYPOINT ["bin/run.sh"]
+CMD ["bin/sonar.sh"]
diff --git a/sonarqube_datacenter-search/run.sh b/sonarqube_lts-datacenter-search/run.sh
similarity index 94%
copy from sonarqube_datacenter-search/run.sh
copy to sonarqube_lts-datacenter-search/run.sh
index 29e41ec..88e7a3d 100755
--- a/sonarqube_datacenter-search/run.sh
+++ b/sonarqube_lts-datacenter-search/run.sh
@@ -14,22 +14,21 @@ set_prop_from_deprecated_env_var() {
# if nothing is passed, assume we want to run sonarqube server
if [ "$#" == 0 ]; then
- set -- /opt/sonarqube/bin/sonar.sh
+ set -- bin/sonar.sh
fi
# if first arg looks like a flag, assume we want to run sonarqube server with flags
if [ "${1:0:1}" = '-' ]; then
- set -- /opt/sonarqube/bin/sonar.sh "$@"
+ set -- bin/sonar.sh "$@"
fi
-if [[ "$1" = '/opt/sonarqube/bin/sonar.sh' ]]; then
+if [[ "$1" = 'bin/sonar.sh' ]]; then
chown -R "$(id -u):$(id -g)" "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
chmod -R 700 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
# Allow the container to be started with `--user`
if [[ "$(id -u)" = '0' ]]; then
chown -R sonarqube:sonarqube "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"
- echo "Dropping Privileges"
exec su-exec sonarqube "$0" "$@"
fi
diff --git a/sonarqube_developer/sonar.sh b/sonarqube_lts-datacenter-search/sonar.sh
similarity index 100%
copy from sonarqube_developer/sonar.sh
copy to sonarqube_lts-datacenter-search/sonar.sh
diff --git a/sonarqube_developer/Dockerfile b/sonarqube_lts-developer/Dockerfile
similarity index 34%
copy from sonarqube_developer/Dockerfile
copy to sonarqube_lts-developer/Dockerfile
index a2b524b..dd9e180 100644
--- a/sonarqube_developer/Dockerfile
+++ b/sonarqube_lts-developer/Dockerfile
@@ -1,15 +1,94 @@
-FROM alpine:3.14
+FROM alpine:3.12
-ENV LANG='en_US.UTF-8' \
+ENV JAVA_VERSION="jdk-11.0.10+9" \
+ LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
+#
+# glibc setup
+#
+RUN set -eux; \
+ apk add --no-cache tzdata --virtual .build-deps curl binutils zstd; \
+ GLIBC_VER="2.33-r0"; \
+ ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download"; \
+ GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.2.0-6-x86_64.pkg.tar.zst"; \
+ GCC_LIBS_SHA256="e33b45e4a10ef26259d6acf8e7b5dd6dc63800641e41eb67fa6588d061f79c1c"; \
+ ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.11-4-x86_64.pkg.tar.xz"; \
+ ZLIB_SHA256=43a17987d348e0b395cb6e28d2ece65fb3b5a0fe433714762780d18c0451c149; \
+ curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub; \
+ SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2"; \
+ echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - ; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ /usr/glibc-compat/bin/localedef --inputfile en_US --charmap UTF-8 "$LANG" || true ;\
+ echo "export LANG=$LANG" > /etc/profile.d/locale.sh; \
+ curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.zst; \
+ echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.zst" | sha256sum -c - ; \
+ mkdir /tmp/gcc; \
+ zstd -d /tmp/gcc-libs.tar.zst --output-dir-flat /tmp; \
+ tar -xf /tmp/gcc-libs.tar -C /tmp/gcc; \
+ mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib; \
+ strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so*; \
+ curl -LfsS ${ZLIB_URL} -o /tmp/libz.tar.xz; \
+ echo "${ZLIB_SHA256} */tmp/libz.tar.xz" | sha256sum -c - ;\
+ mkdir /tmp/libz; \
+ tar -xf /tmp/libz.tar.xz -C /tmp/libz; \
+ mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib; \
+ apk del --purge .build-deps glibc-i18n; \
+ rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
+
+#
+# Adoptium openjdk11 setup
+#
+RUN set -eux; \
+ apk add --no-cache --virtual .fetch-deps curl; \
+ ARCH="$(apk --print-arch)"; \
+ case "${ARCH}" in \
+ aarch64|arm64) \
+ ESUM='76f7da05d905b5f9de8de1a34c1a206744f7589bf0eed876cd9069cb1d913806'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ armhf|armv7l) \
+ ESUM='aee2f20d005b58e79c3c6c02271f797cb387d33a135b762886990b9bf7cb262e'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ ppc64el|ppc64le) \
+ ESUM='8f267876675dac3da3f4ceccd44d812b57098505eeec5fb1688d54bdeffcd1da'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ s390x) \
+ ESUM='b4a5af4ffcc98f6b7cdd2232f79aa12f20efa769b5255277fa4974e2e19d4409'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ amd64|x86_64) \
+ ESUM='fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ *) \
+ echo "Unsupported arch: ${ARCH}"; \
+ exit 1; \
+ ;; \
+ esac; \
+ curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+ mkdir -p /opt/java/openjdk; \
+ cd /opt/java/openjdk; \
+ tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+ apk del --purge .fetch-deps; \
+ rm -rf /var/cache/apk/*; \
+ rm -rf /tmp/openjdk.tar.gz;
+
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.3.0.51899
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip
-ENV JAVA_HOME='/usr/lib/jvm/java-11-openjdk' \
+ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
SONARQUBE_HOME=/opt/sonarqube \
SONAR_VERSION="${SONARQUBE_VERSION}" \
@@ -22,7 +101,7 @@ RUN set -eux; \
addgroup -S -g 1000 sonarqube; \
adduser -S -D -u 1000 -G sonarqube sonarqube; \
apk add --no-cache --virtual build-dependencies gnupg unzip curl; \
- apk add --no-cache bash su-exec ttf-dejavu openjdk11-jre; \
+ apk add --no-cache bash su-exec ttf-dejavu; \
# pub 2048R/D26468DE 2015-05-25
# Key fingerprint = F118 2E81 C792 9289 21DB CAB4 CFCA 4A29 D264 68DE
# uid sonarsource_deployer (Sonarsource Deployer) <infra@sonarsource.com>
@@ -54,8 +133,5 @@ COPY --chown=sonarqube:sonarqube run.sh sonar.sh ${SONARQUBE_HOME}/bin/
WORKDIR ${SONARQUBE_HOME}
EXPOSE 9000
-
-STOPSIGNAL SIGINT
-
-ENTRYPOINT ["/opt/sonarqube/bin/run.sh"]
-CMD ["/opt/sonarqube/bin/sonar.sh"]
+ENTRYPOINT ["bin/run.sh"]
+CMD ["bin/sonar.sh"]
diff --git a/sonarqube_developer/run.sh b/sonarqube_lts-developer/run.sh
similarity index 92%
copy from sonarqube_developer/run.sh
copy to sonarqube_lts-developer/run.sh
index b4935e1..ebb36e8 100755
--- a/sonarqube_developer/run.sh
+++ b/sonarqube_lts-developer/run.sh
@@ -11,22 +11,21 @@ set_prop_from_deprecated_env_var() {
# if nothing is passed, assume we want to run sonarqube server
if [ "$#" == 0 ]; then
- set -- /opt/sonarqube/bin/sonar.sh
+ set -- bin/sonar.sh
fi
# if first arg looks like a flag, assume we want to run sonarqube server with flags
if [ "${1:0:1}" = '-' ]; then
- set -- /opt/sonarqube/bin/sonar.sh "$@"
+ set -- bin/sonar.sh "$@"
fi
-if [[ "$1" = '/opt/sonarqube/bin/sonar.sh' ]]; then
+if [[ "$1" = 'bin/sonar.sh' ]]; then
chown -R "$(id -u):$(id -g)" "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
chmod -R 700 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
# Allow the container to be started with `--user`
if [[ "$(id -u)" = '0' ]]; then
chown -R sonarqube:sonarqube "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"
- echo "Dropping Privileges"
exec su-exec sonarqube "$0" "$@"
fi
diff --git a/sonarqube_developer/sonar.sh b/sonarqube_lts-developer/sonar.sh
similarity index 100%
copy from sonarqube_developer/sonar.sh
copy to sonarqube_lts-developer/sonar.sh
diff --git a/sonarqube_enterprise/Dockerfile b/sonarqube_lts-enterprise/Dockerfile
similarity index 34%
copy from sonarqube_enterprise/Dockerfile
copy to sonarqube_lts-enterprise/Dockerfile
index 8fff3c2..71fc3ea 100644
--- a/sonarqube_enterprise/Dockerfile
+++ b/sonarqube_lts-enterprise/Dockerfile
@@ -1,15 +1,94 @@
-FROM alpine:3.14
+FROM alpine:3.12
-ENV LANG='en_US.UTF-8' \
+ENV JAVA_VERSION="jdk-11.0.10+9" \
+ LANG='en_US.UTF-8' \
LANGUAGE='en_US:en' \
LC_ALL='en_US.UTF-8'
+#
+# glibc setup
+#
+RUN set -eux; \
+ apk add --no-cache tzdata --virtual .build-deps curl binutils zstd; \
+ GLIBC_VER="2.33-r0"; \
+ ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download"; \
+ GCC_LIBS_URL="https://archive.archlinux.org/packages/g/gcc-libs/gcc-libs-10.2.0-6-x86_64.pkg.tar.zst"; \
+ GCC_LIBS_SHA256="e33b45e4a10ef26259d6acf8e7b5dd6dc63800641e41eb67fa6588d061f79c1c"; \
+ ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.11-4-x86_64.pkg.tar.xz"; \
+ ZLIB_SHA256=43a17987d348e0b395cb6e28d2ece65fb3b5a0fe433714762780d18c0451c149; \
+ curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub; \
+ SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2"; \
+ echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - ; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-${GLIBC_VER}.apk > /tmp/glibc-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-${GLIBC_VER}.apk; \
+ curl -LfsS ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk > /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-bin-${GLIBC_VER}.apk; \
+ curl -Ls ${ALPINE_GLIBC_REPO}/${GLIBC_VER}/glibc-i18n-${GLIBC_VER}.apk > /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ apk add --no-cache /tmp/glibc-i18n-${GLIBC_VER}.apk; \
+ /usr/glibc-compat/bin/localedef --inputfile en_US --charmap UTF-8 "$LANG" || true ;\
+ echo "export LANG=$LANG" > /etc/profile.d/locale.sh; \
+ curl -LfsS ${GCC_LIBS_URL} -o /tmp/gcc-libs.tar.zst; \
+ echo "${GCC_LIBS_SHA256} */tmp/gcc-libs.tar.zst" | sha256sum -c - ; \
+ mkdir /tmp/gcc; \
+ zstd -d /tmp/gcc-libs.tar.zst --output-dir-flat /tmp; \
+ tar -xf /tmp/gcc-libs.tar -C /tmp/gcc; \
+ mv /tmp/gcc/usr/lib/libgcc* /tmp/gcc/usr/lib/libstdc++* /usr/glibc-compat/lib; \
+ strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so*; \
+ curl -LfsS ${ZLIB_URL} -o /tmp/libz.tar.xz; \
+ echo "${ZLIB_SHA256} */tmp/libz.tar.xz" | sha256sum -c - ;\
+ mkdir /tmp/libz; \
+ tar -xf /tmp/libz.tar.xz -C /tmp/libz; \
+ mv /tmp/libz/usr/lib/libz.so* /usr/glibc-compat/lib; \
+ apk del --purge .build-deps glibc-i18n; \
+ rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
+
+#
+# Adoptium openjdk11 setup
+#
+RUN set -eux; \
+ apk add --no-cache --virtual .fetch-deps curl; \
+ ARCH="$(apk --print-arch)"; \
+ case "${ARCH}" in \
+ aarch64|arm64) \
+ ESUM='76f7da05d905b5f9de8de1a34c1a206744f7589bf0eed876cd9069cb1d913806'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ armhf|armv7l) \
+ ESUM='aee2f20d005b58e79c3c6c02271f797cb387d33a135b762886990b9bf7cb262e'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ ppc64el|ppc64le) \
+ ESUM='8f267876675dac3da3f4ceccd44d812b57098505eeec5fb1688d54bdeffcd1da'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ s390x) \
+ ESUM='b4a5af4ffcc98f6b7cdd2232f79aa12f20efa769b5255277fa4974e2e19d4409'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ amd64|x86_64) \
+ ESUM='fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz'; \
+ ;; \
+ *) \
+ echo "Unsupported arch: ${ARCH}"; \
+ exit 1; \
+ ;; \
+ esac; \
+ curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+ mkdir -p /opt/java/openjdk; \
+ cd /opt/java/openjdk; \
+ tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+ apk del --purge .fetch-deps; \
+ rm -rf /var/cache/apk/*; \
+ rm -rf /tmp/openjdk.tar.gz;
+
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=9.3.0.51899
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip
-ENV JAVA_HOME='/usr/lib/jvm/java-11-openjdk' \
+ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
SONARQUBE_HOME=/opt/sonarqube \
SONAR_VERSION="${SONARQUBE_VERSION}" \
@@ -22,7 +101,7 @@ RUN set -eux; \
addgroup -S -g 1000 sonarqube; \
adduser -S -D -u 1000 -G sonarqube sonarqube; \
apk add --no-cache --virtual build-dependencies gnupg unzip curl; \
- apk add --no-cache bash su-exec ttf-dejavu openjdk11-jre; \
+ apk add --no-cache bash su-exec ttf-dejavu; \
# pub 2048R/D26468DE 2015-05-25
# Key fingerprint = F118 2E81 C792 9289 21DB CAB4 CFCA 4A29 D264 68DE
# uid sonarsource_deployer (Sonarsource Deployer) <infra@sonarsource.com>
@@ -54,8 +133,5 @@ COPY --chown=sonarqube:sonarqube run.sh sonar.sh ${SONARQUBE_HOME}/bin/
WORKDIR ${SONARQUBE_HOME}
EXPOSE 9000
-
-STOPSIGNAL SIGINT
-
-ENTRYPOINT ["/opt/sonarqube/bin/run.sh"]
-CMD ["/opt/sonarqube/bin/sonar.sh"]
+ENTRYPOINT ["bin/run.sh"]
+CMD ["bin/sonar.sh"]
diff --git a/sonarqube_developer/run.sh b/sonarqube_lts-enterprise/run.sh
similarity index 92%
copy from sonarqube_developer/run.sh
copy to sonarqube_lts-enterprise/run.sh
index b4935e1..ebb36e8 100755
--- a/sonarqube_developer/run.sh
+++ b/sonarqube_lts-enterprise/run.sh
@@ -11,22 +11,21 @@ set_prop_from_deprecated_env_var() {
# if nothing is passed, assume we want to run sonarqube server
if [ "$#" == 0 ]; then
- set -- /opt/sonarqube/bin/sonar.sh
+ set -- bin/sonar.sh
fi
# if first arg looks like a flag, assume we want to run sonarqube server with flags
if [ "${1:0:1}" = '-' ]; then
- set -- /opt/sonarqube/bin/sonar.sh "$@"
+ set -- bin/sonar.sh "$@"
fi
-if [[ "$1" = '/opt/sonarqube/bin/sonar.sh' ]]; then
+if [[ "$1" = 'bin/sonar.sh' ]]; then
chown -R "$(id -u):$(id -g)" "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
chmod -R 700 "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}" 2>/dev/null || :
# Allow the container to be started with `--user`
if [[ "$(id -u)" = '0' ]]; then
chown -R sonarqube:sonarqube "${SQ_DATA_DIR}" "${SQ_EXTENSIONS_DIR}" "${SQ_LOGS_DIR}" "${SQ_TEMP_DIR}"
- echo "Dropping Privileges"
exec su-exec sonarqube "$0" "$@"
fi
diff --git a/sonarqube_developer/sonar.sh b/sonarqube_lts-enterprise/sonar.sh
similarity index 100%
copy from sonarqube_developer/sonar.sh
copy to sonarqube_lts-enterprise/sonar.shRelevant Maintainers: |
|
Slightly enhanced diff to previous Diff:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6fc5f3c..a7e9919 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,35 +1,35 @@
-# sonarqube:8.9.6-community
+# sonarqube:8.9.7-community
Maintainers: Christophe Levis <christophe.levis@sonarsource.com> (@christophelevis), Pierre Guillot <pierre.guillot@sonarsource.com> (@pierre-guillot-sonarsource), Tobias Trabelsi <tobias.trabelsi@sonarsource.com> (@tobias-trabelsi-sonarsource), Lukasz Jarocki <lukasz.jarocki@sonarsource.com> (@lukasz-jarocki-sonarsource)
GitRepo: https://github.com/SonarSource/docker-sonarqube.git
-GitCommit: 11e88744db150517a75c176fcd80893999b62f95
+GitCommit: 3f19b396006f2a8466854cae90329a55692fa073
-Tags: 8.9.6-community, 8.9-community, 8-community, lts, lts-community
+Tags: 8.9.7-community, 8.9-community, 8-community, lts, lts-community
Directory: 8/community
-# sonarqube:8.9.6-datacenter-app
-# (see also sonarqube:8.9.6-community above)
+# sonarqube:8.9.7-datacenter-app
+# (see also sonarqube:8.9.7-community above)
-Tags: 8.9.6-datacenter-app, 8.9-datacenter-app, 8-datacenter-app, lts-datacenter-app
+Tags: 8.9.7-datacenter-app, 8.9-datacenter-app, 8-datacenter-app, lts-datacenter-app
Directory: 8/datacenter/app
-# sonarqube:8.9.6-datacenter-search
-# (see also sonarqube:8.9.6-community above)
+# sonarqube:8.9.7-datacenter-search
+# (see also sonarqube:8.9.7-community above)
-Tags: 8.9.6-datacenter-search, 8.9-datacenter-search, 8-datacenter-search, lts-datacenter-search
+Tags: 8.9.7-datacenter-search, 8.9-datacenter-search, 8-datacenter-search, lts-datacenter-search
Directory: 8/datacenter/search
-# sonarqube:8.9.6-developer
-# (see also sonarqube:8.9.6-community above)
+# sonarqube:8.9.7-developer
+# (see also sonarqube:8.9.7-community above)
-Tags: 8.9.6-developer, 8.9-developer, 8-developer, lts-developer
+Tags: 8.9.7-developer, 8.9-developer, 8-developer, lts-developer
Directory: 8/developer
-# sonarqube:8.9.6-enterprise
-# (see also sonarqube:8.9.6-community above)
+# sonarqube:8.9.7-enterprise
+# (see also sonarqube:8.9.7-community above)
-Tags: 8.9.6-enterprise, 8.9-enterprise, 8-enterprise, lts-enterprise
+Tags: 8.9.7-enterprise, 8.9-enterprise, 8-enterprise, lts-enterprise
Directory: 8/enterprise
diff --git a/_bashbrew-list b/_bashbrew-list
index 6d6e533..0b0a76c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,11 +8,11 @@ sonarqube:8.9-datacenter-app
sonarqube:8.9-datacenter-search
sonarqube:8.9-developer
sonarqube:8.9-enterprise
-sonarqube:8.9.6-community
-sonarqube:8.9.6-datacenter-app
-sonarqube:8.9.6-datacenter-search
-sonarqube:8.9.6-developer
-sonarqube:8.9.6-enterprise
+sonarqube:8.9.7-community
+sonarqube:8.9.7-datacenter-app
+sonarqube:8.9.7-datacenter-search
+sonarqube:8.9.7-developer
+sonarqube:8.9.7-enterprise
sonarqube:lts
sonarqube:lts-community
sonarqube:lts-datacenter-app
diff --git a/sonarqube_lts-community/Dockerfile b/sonarqube_lts-community/Dockerfile
index fed6e10..2addcf7 100644
--- a/sonarqube_lts-community/Dockerfile
+++ b/sonarqube_lts-community/Dockerfile
@@ -43,31 +43,31 @@ RUN set -eux; \
rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
#
-# AdoptOpenJDK/openjdk11 setup
+# Adoptium openjdk11 setup
#
RUN set -eux; \
apk add --no-cache --virtual .fetch-deps curl; \
ARCH="$(apk --print-arch)"; \
case "${ARCH}" in \
aarch64|arm64) \
- ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='76f7da05d905b5f9de8de1a34c1a206744f7589bf0eed876cd9069cb1d913806'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
armhf|armv7l) \
- ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='aee2f20d005b58e79c3c6c02271f797cb387d33a135b762886990b9bf7cb262e'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
ppc64el|ppc64le) \
- ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='8f267876675dac3da3f4ceccd44d812b57098505eeec5fb1688d54bdeffcd1da'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
s390x) \
- ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='b4a5af4ffcc98f6b7cdd2232f79aa12f20efa769b5255277fa4974e2e19d4409'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
amd64|x86_64) \
- ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
@@ -86,7 +86,7 @@ RUN set -eux; \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=8.9.6.50800
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/Distribution/sonarqube/sonarqube-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
diff --git a/sonarqube_lts-datacenter-app/Dockerfile b/sonarqube_lts-datacenter-app/Dockerfile
index 2d28cba..607c6a5 100644
--- a/sonarqube_lts-datacenter-app/Dockerfile
+++ b/sonarqube_lts-datacenter-app/Dockerfile
@@ -43,31 +43,31 @@ RUN set -eux; \
rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
#
-# AdoptOpenJDK/openjdk11 setup
+# Adoptium openjdk11 setup
#
RUN set -eux; \
apk add --no-cache --virtual .fetch-deps curl; \
ARCH="$(apk --print-arch)"; \
case "${ARCH}" in \
aarch64|arm64) \
- ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='76f7da05d905b5f9de8de1a34c1a206744f7589bf0eed876cd9069cb1d913806'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
armhf|armv7l) \
- ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='aee2f20d005b58e79c3c6c02271f797cb387d33a135b762886990b9bf7cb262e'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
ppc64el|ppc64le) \
- ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='8f267876675dac3da3f4ceccd44d812b57098505eeec5fb1688d54bdeffcd1da'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
s390x) \
- ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='b4a5af4ffcc98f6b7cdd2232f79aa12f20efa769b5255277fa4974e2e19d4409'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
amd64|x86_64) \
- ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
@@ -86,7 +86,7 @@ RUN set -eux; \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=8.9.6.50800
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
diff --git a/sonarqube_lts-datacenter-search/Dockerfile b/sonarqube_lts-datacenter-search/Dockerfile
index 95f68fe..f0c19b7 100644
--- a/sonarqube_lts-datacenter-search/Dockerfile
+++ b/sonarqube_lts-datacenter-search/Dockerfile
@@ -85,7 +85,7 @@ RUN set -eux; \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=8.9.6.50800
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-datacenter/sonarqube-datacenter-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
diff --git a/sonarqube_lts-developer/Dockerfile b/sonarqube_lts-developer/Dockerfile
index 6371df5..dd9e180 100644
--- a/sonarqube_lts-developer/Dockerfile
+++ b/sonarqube_lts-developer/Dockerfile
@@ -43,31 +43,31 @@ RUN set -eux; \
rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
#
-# AdoptOpenJDK/openjdk11 setup
+# Adoptium openjdk11 setup
#
RUN set -eux; \
apk add --no-cache --virtual .fetch-deps curl; \
ARCH="$(apk --print-arch)"; \
case "${ARCH}" in \
aarch64|arm64) \
- ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='76f7da05d905b5f9de8de1a34c1a206744f7589bf0eed876cd9069cb1d913806'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
armhf|armv7l) \
- ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='aee2f20d005b58e79c3c6c02271f797cb387d33a135b762886990b9bf7cb262e'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
ppc64el|ppc64le) \
- ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='8f267876675dac3da3f4ceccd44d812b57098505eeec5fb1688d54bdeffcd1da'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
s390x) \
- ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='b4a5af4ffcc98f6b7cdd2232f79aa12f20efa769b5255277fa4974e2e19d4409'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
amd64|x86_64) \
- ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
@@ -86,7 +86,7 @@ RUN set -eux; \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=8.9.6.50800
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-developer/sonarqube-developer-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \
diff --git a/sonarqube_lts-enterprise/Dockerfile b/sonarqube_lts-enterprise/Dockerfile
index 601aeba..71fc3ea 100644
--- a/sonarqube_lts-enterprise/Dockerfile
+++ b/sonarqube_lts-enterprise/Dockerfile
@@ -43,31 +43,31 @@ RUN set -eux; \
rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/*;
#
-# AdoptOpenJDK/openjdk11 setup
+# Adoptium openjdk11 setup
#
RUN set -eux; \
apk add --no-cache --virtual .fetch-deps curl; \
ARCH="$(apk --print-arch)"; \
case "${ARCH}" in \
aarch64|arm64) \
- ESUM='fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='76f7da05d905b5f9de8de1a34c1a206744f7589bf0eed876cd9069cb1d913806'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
armhf|armv7l) \
- ESUM='ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='aee2f20d005b58e79c3c6c02271f797cb387d33a135b762886990b9bf7cb262e'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_arm_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
ppc64el|ppc64le) \
- ESUM='37c19c7c2d1cea627b854a475ef1a765d30357d765d20cf3f96590037e79d0f3'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='8f267876675dac3da3f4ceccd44d812b57098505eeec5fb1688d54bdeffcd1da'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
s390x) \
- ESUM='f18101fc50aad795a41b4d3bbc591308c83664fd2390bf2bc007fd9b3d531e6c'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_s390x_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='b4a5af4ffcc98f6b7cdd2232f79aa12f20efa769b5255277fa4974e2e19d4409'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_s390x_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
amd64|x86_64) \
- ESUM='144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548'; \
- BINARY_URL='https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz'; \
+ ESUM='fb0a27e6e1f26a1ee79daa92e4cfe3ec0d676acfe114d99dd84b3414f056e8a0'; \
+ BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jre_x64_linux_hotspot_11.0.13_8.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
@@ -86,7 +86,7 @@ RUN set -eux; \
#
# SonarQube setup
#
-ARG SONARQUBE_VERSION=8.9.6.50800
+ARG SONARQUBE_VERSION=8.9.7.52159
ARG SONARQUBE_ZIP_URL=https://binaries.sonarsource.com/CommercialDistribution/sonarqube-enterprise/sonarqube-enterprise-${SONARQUBE_VERSION}.zip
ENV JAVA_HOME=/opt/java/openjdk \
PATH="/opt/java/openjdk/bin:$PATH" \ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This also brings back the 8.9 LTS tags