Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .tekton/dockerfile/Dockerfile.base
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
FROM docker-mirrors.alauda.cn/library/golang:1.25.5-bookworm AS builder

WORKDIR /app

COPY . /app

ENV GOPROXY='https://build-nexus.alauda.cn/repository/golang/,direct'
RUN PWGO_VER=$(grep -oE "playwright-go v\S+" /app/testing/go.mod | sed 's/playwright-go //g') \
&& go install github.com/playwright-community/playwright-go/cmd/playwright@${PWGO_VER}

FROM docker-mirrors.alauda.cn/library/openjdk:26-ea-17-jdk-slim-bookworm

WORKDIR /app

COPY --from=builder /go/bin/playwright /app/bin/playwright

RUN /app/bin/playwright install chromium --with-deps

ARG SONAR_SCANNER_VERSION=7.1.0.4889
RUN set -ex; \
apt-get update; \
Expand Down
4 changes: 2 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ global:
sonarqube:
code: github.com/AlaudaDevops/docker-sonarqube
repository: devops/sonarqube
tag: v2025.1.0-g9878f73
tag: v2025.1.0-ge5a8c9b
support_arm: true
thirdparty: true
digest: sha256:bd8aa76c68de359ef5495dafa155fe98b12009a82ad01bb10325226fd3f6b4be
pluginPackage:
code: github.com/AlaudaDevops/docker-sonarqube
repository: devops/sonarqube-plugins
tag: v2025.1.0-g9878f73
tag: v2025.1.0-ge5a8c9b
support_arm: true
thirdparty: true
digest: sha256:565500e7f0acfb7da4693eaf49b24629dc1fcd7cc6ca4571809c794959d0c0d8
Expand Down
5 changes: 4 additions & 1 deletion image/community-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,15 @@ ARG NETTY_VERSION=4.1.128.Final
ARG BC_VERSION=1.0.2.6
# renovate: datasource=maven depName=bcpkix-jdk18on lookupName=org.bouncycastle:bcpkix-jdk18on
ARG BCPKIX_VERSION=1.79
# renovate: datasource=maven depName=lz4-java lookupName=at.yawk.lz4:lz4-java
ARG LZ4_JAVA_VERSION=1.8.1
RUN chmod +x /tmp/replace-jar.sh && \
/tmp/replace-jar.sh io.netty netty-codec 4.1.118.Final ${NETTY_VERSION} /data/sonarqube/elasticsearch && \
/tmp/replace-jar.sh io.netty netty-codec-http 4.1.118.Final ${NETTY_VERSION} /data/sonarqube/elasticsearch && \
/tmp/replace-jar.sh io.netty netty-codec-http2 4.1.118.Final ${NETTY_VERSION} /data/sonarqube/elasticsearch && \
/tmp/replace-jar.sh org.bouncycastle bc-fips 1.0.2.5 ${BC_VERSION} /data/sonarqube/elasticsearch && \
/tmp/replace-jar.sh org.bouncycastle bcpkix-jdk18on 1.78.1 ${BCPKIX_VERSION} /data/sonarqube/elasticsearch
/tmp/replace-jar.sh org.bouncycastle bcpkix-jdk18on 1.78.1 ${BCPKIX_VERSION} /data/sonarqube/elasticsearch && \
/tmp/replace-jar.sh at.yawk.lz4 lz4-java 1.8.0 ${LZ4_JAVA_VERSION} /data/sonarqube/elasticsearch

FROM docker-mirrors.alauda.cn/library/eclipse-temurin:${JRE_IMAGE_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion image/plugin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM build-harbor.alauda.cn/ops/alpine:3@sha256:d97795482dc347cc59432bf4fe506b5f92ca03f83d4fd3c746b8fa49d8371e5a
FROM build-harbor.alauda.cn/ops/alpine:3.21.5-alauda-202512020944

ADD plugins.txt /tmp/plugins/
WORKDIR /tmp/plugins
Expand Down
15 changes: 13 additions & 2 deletions source/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,17 @@ subprojects {
}
}

// Force replace org.lz4:lz4-java with at.yawk.lz4:lz4-java globally
configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
// Replace org.lz4:lz4-java with at.yawk.lz4:lz4-java
if (details.requested.group == 'org.lz4' && details.requested.name == 'lz4-java') {
details.useTarget group: 'at.yawk.lz4', name: 'lz4-java', version: '1.8.1'
details.because 'Force use at.yawk.lz4:lz4-java instead of org.lz4:lz4-java'
}
}
}

// Central place for definition dependency versions and exclusions.
dependencyManagement {
dependencies {
Expand Down Expand Up @@ -421,7 +432,7 @@ subprojects {
dependency 'junit:junit:4.13.2'
dependency 'org.xmlunit:xmlunit-core:2.10.4'
dependency 'org.xmlunit:xmlunit-matchers:2.10.4'
dependency 'org.lz4:lz4-java:1.8.0'
dependency 'at.yawk.lz4:lz4-java:1.8.1'
dependency 'org.littleshoot:littleproxy:1.1.2'
dependency 'net.sf.trove4j:core:3.1.0'
dependency 'org.awaitility:awaitility:4.2.2'
Expand Down Expand Up @@ -794,7 +805,7 @@ subprojects {
}

dependencies {
bbtRuntimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
bbtRuntimeOnly 'com.microsoft.sqlserver:mssql-jdbc:12.8.2.jre11'
bbtRuntimeOnly 'com.oracle.database.jdbc:ojdbc11'
bbtRuntimeOnly 'org.postgresql:postgresql'
bbtRuntimeOnly project(':plugins:sonar-xoo-plugin')
Expand Down
2 changes: 1 addition & 1 deletion source/server/sonar-db-dao/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
api 'com.google.protobuf:protobuf-java'
api 'commons-io:commons-io'
api 'org.apache.commons:commons-lang3'
api 'org.lz4:lz4-java'
api 'at.yawk.lz4:lz4-java'
api 'org.mybatis:mybatis'
api 'org.sonarsource.api.plugin:sonar-plugin-api'

Expand Down
6 changes: 1 addition & 5 deletions testing/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
FROM docker-mirrors.alauda.cn/library/golang:1.25.2-bookworm AS builder
FROM docker-mirrors.alauda.cn/library/golang:1.25.5-bookworm AS builder

WORKDIR /app

COPY . /app

ENV GOPROXY='https://build-nexus.alauda.cn/repository/golang/,direct'
RUN PWGO_VER=$(grep -oE "playwright-go v\S+" /app/testing/go.mod | sed 's/playwright-go //g') \
&& go install github.com/playwright-community/playwright-go/cmd/playwright@${PWGO_VER}
RUN set -eux \
&& mkdir -p /tools/bin && chmod -R 777 /tools/bin \
&& cd /app/testing \
Expand All @@ -24,8 +22,6 @@ COPY --chown=nonroot:nonroot ./testing /app/testing
COPY --chown=nonroot:nonroot --from=builder /tools/bin/sonarqube-e2e.test /app/bin/sonarqube-e2e.test
COPY --chown=nonroot:nonroot --from=builder /go/bin/playwright /app/bin/playwright

RUN /app/bin/playwright install chromium --with-deps

WORKDIR /app/testing

ENV PATH="${PATH}:/app/sonar-scanner/bin:/app/bin"
Expand Down
61 changes: 25 additions & 36 deletions testing/go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module sonarqube

go 1.25.1
go 1.25.5

require (
github.com/AlaudaDevops/bdd v0.0.0-20250520092225-08e5f21c96bc
github.com/AlaudaDevops/bdd v1.7.1
github.com/cucumber/godog v0.15.1
github.com/go-resty/resty/v2 v2.6.0
github.com/playwright-community/playwright-go v0.4902.0
go.uber.org/zap v1.27.0
go.uber.org/zap v1.27.1
gopkg.in/yaml.v3 v3.0.1
k8s.io/apimachinery v0.33.5
k8s.io/client-go v0.33.5
k8s.io/apimachinery v0.33.6
k8s.io/client-go v0.33.6
)

require (
Expand All @@ -31,16 +31,12 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.15.2 // indirect
github.com/cloudflare/circl v1.6.1 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/davidmz/go-pageant v1.0.2 // indirect
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
github.com/docker/cli v28.2.2+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.3 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
Expand All @@ -57,10 +53,10 @@ require (
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.22.0 // indirect
github.com/go-openapi/jsonreference v0.21.1 // indirect
github.com/go-openapi/jsonpointer v0.22.3 // indirect
github.com/go-openapi/jsonreference v0.21.3 // indirect
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-openapi/swag/jsonname v0.24.0 // indirect
github.com/go-openapi/swag/jsonname v0.25.3 // indirect
github.com/go-sprout/sprout v1.0.2 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
Expand All @@ -74,7 +70,6 @@ require (
github.com/google/cel-go v0.24.1 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-containerregistry v0.20.6 // indirect
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
Expand All @@ -89,10 +84,8 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mailru/easyjson v0.9.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -102,8 +95,6 @@ require (
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
github.com/onsi/gomega v1.36.3 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/openzipkin/zipkin-go v0.4.3 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pjbgf/sha1cd v0.3.2 // indirect
Expand All @@ -114,12 +105,10 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/statsd_exporter v0.22.8 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/skeema/knownhosts v1.3.1 // indirect
github.com/skeema/knownhosts v1.3.2 // indirect
github.com/spf13/cast v1.9.2 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/stoewer/go-strcase v1.3.1 // indirect
github.com/vbatts/tar-split v0.12.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.opencensus.io v0.24.0 // indirect
Expand All @@ -134,33 +123,33 @@ require (
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.42.0 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
golang.org/x/net v0.44.0 // indirect
golang.org/x/oauth2 v0.31.0 // indirect
golang.org/x/sync v0.17.0 // indirect
golang.org/x/sys v0.36.0 // indirect
golang.org/x/term v0.35.0 // indirect
golang.org/x/text v0.29.0 // indirect
golang.org/x/time v0.13.0 // indirect
golang.org/x/tools v0.37.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/oauth2 v0.33.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/term v0.37.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.39.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/api v0.183.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
google.golang.org/grpc v1.71.3 // indirect
google.golang.org/protobuf v1.36.9 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.33.5 // indirect
k8s.io/apiextensions-apiserver v0.33.5 // indirect
k8s.io/apiserver v0.33.5 // indirect
k8s.io/component-base v0.33.5 // indirect
k8s.io/api v0.33.6 // indirect
k8s.io/apiextensions-apiserver v0.33.6 // indirect
k8s.io/apiserver v0.33.6 // indirect
k8s.io/component-base v0.33.6 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
k8s.io/kubectl v0.31.13 // indirect
k8s.io/kubectl v0.31.14 // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
knative.dev/pkg v0.0.0-20231023150739-56bfe0dd9626 // indirect
sigs.k8s.io/controller-runtime v0.21.0 // indirect
Expand Down
Loading