Skip to content

Commit 6faa261

Browse files
fix dockerfile
Signed-off-by: stoneshi-yunify <[email protected]>
1 parent 08b29dd commit 6faa261

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

base/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ RUN arch=$(dpkg --print-architecture) && \
9292
wget -O sonar_scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-${TARGET_ARCH}.zip && \
9393
unzip sonar_scanner.zip -d /opt && \
9494
rm sonar_scanner.zip && \
95-
ln -fs /opt/sonar-scanner-${SONAR_SCANNER_VERSION}-${TARGET_ARCH}/bin/sonar-scanner /usr/local/bin/sonar-scanner
95+
mv /opt/sonar-scanner-${SONAR_SCANNER_VERSION}-${TARGET_ARCH} /opt/sonar-scanner && \
96+
ln -fs /opt/sonar-scanner/bin/sonar-scanner /usr/local/bin/sonar-scanner
9697

9798
# Install ks (Kubesphere CLI)
9899
RUN curl -fL https://github.com/kubesphere-sigs/ks/releases/download/v0.0.73/ks-linux-$(dpkg --print-architecture).tar.gz | tar xzv && \
@@ -121,8 +122,9 @@ RUN ln -fs /root/.sdkman/candidates/gradle/current/bin/gradle /usr/local/bin/gra
121122

122123
# Install Maven
123124
ENV MAVEN_VERSION=3.9.9
124-
RUN curl -f -L https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar -C /opt -xzv
125-
ENV M2_HOME=/opt/apache-maven-$MAVEN_VERSION
125+
RUN curl -f -L https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar -C /opt -xzv && \
126+
mv /opt/apache-maven-${MAVEN_VERSION} /opt/apache-maven
127+
ENV M2_HOME=/opt/apache-maven
126128
ENV maven.home=$M2_HOME
127129
ENV M2=$M2_HOME/bin
128130
ENV PATH=$PATH:$M2

0 commit comments

Comments
 (0)