[COMMON] remove old gradle and disable to set REVISION with branch name

chia7712 · May 5, 2024 · 2a3eba5 · 2a3eba5
1 parent 10e58d9
commit 2a3eba5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/docker/build_deps_image.sh b/docker/build_deps_image.sh
@@ -32,11 +32,6 @@ RUN apt-get update && apt-get install -y \
   unzip \
   curl
 
-# download gradle 5 for previous kafka having no built-in gradlew
-WORKDIR /tmp
-RUN wget https://downloads.gradle.org/distributions/gradle-5.6.4-bin.zip
-RUN unzip gradle-5.6.4-bin.zip
-
 # build code and download dependencies
 WORKDIR /astraea
 RUN git clone https://github.com/skiptests/astraea.git /astraea

diff --git a/docker/start_broker.sh b/docker/start_broker.sh
@@ -82,11 +82,10 @@ RUN wget https://raw.githubusercontent.com/prometheus/jmx_exporter/master/exampl
 RUN wget https://REPO1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${EXPORTER_VERSION}/jmx_prometheus_javaagent-${EXPORTER_VERSION}.jar
 
 # build kafka from source code
-RUN git clone ${kafka_repo} /tmp/kafka
+RUN git clone --depth=1 ${kafka_repo} /tmp/kafka
 WORKDIR /tmp/kafka
+RUN git fetch --depth=1 origin $VERSION
 RUN git checkout $VERSION
-# generate gradlew for previous
-RUN cp /tmp/kafka/gradlew /tmp/gradlew || /tmp/gradle-5.6.4/bin/gradle
 RUN ./gradlew clean releaseTarGz
 RUN mkdir /opt/kafka
 RUN tar -zxvf \$(find ./core/build/distributions/ -maxdepth 1 -type f \( -iname \"kafka*tgz\" ! -iname \"*sit*\" \)) -C /opt/kafka --strip-components=1

diff --git a/docker/start_controller.sh b/docker/start_controller.sh
@@ -70,8 +70,9 @@ RUN wget https://raw.githubusercontent.com/prometheus/jmx_exporter/master/exampl
 RUN wget https://REPO1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${EXPORTER_VERSION}/jmx_prometheus_javaagent-${EXPORTER_VERSION}.jar
 
 # build kafka from source code
-RUN git clone ${kafka_repo} /tmp/kafka
+RUN git clone --depth=1 ${kafka_repo} /tmp/kafka
 WORKDIR /tmp/kafka
+RUN git fetch --depth=1 origin $VERSION
 RUN git checkout $VERSION
 RUN ./gradlew clean releaseTarGz
 RUN mkdir /opt/kafka

diff --git a/docker/start_worker.sh b/docker/start_worker.sh
@@ -80,11 +80,10 @@ function generateDockerfileBySource() {
 FROM ghcr.io/skiptests/astraea/deps AS build
 
 # build kafka from source code
-RUN git clone ${kafka_repo} /tmp/kafka
+RUN git clone --depth=1 ${kafka_repo} /tmp/kafka
 WORKDIR /tmp/kafka
+RUN git fetch --depth=1 origin $VERSION
 RUN git checkout $VERSION
-# generate gradlew for previous
-RUN cp /tmp/kafka/gradlew /tmp/gradlew || /tmp/gradle-5.6.4/bin/gradle
 RUN ./gradlew clean releaseTarGz
 RUN mkdir /opt/kafka
 RUN tar -zxvf \$(find ./core/build/distributions/ -maxdepth 1 -type f \( -iname \"kafka*tgz\" ! -iname \"*sit*\" \)) -C /opt/kafka --strip-components=1