This is an automated email from the ASF dual-hosted git repository.
roryqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new 13c71438 [#951] fix rss-server Docker image building bug. (#1027)
13c71438 is described below
commit 13c71438c5fd614cdd08939d160afa722475beee
Author: SevenAddSix <[email protected]>
AuthorDate: Fri Aug 11 15:59:58 2023 +0800
[#951] fix rss-server Docker image building bug. (#1027)
### What changes were proposed in this pull request?
Add the HADOOP_VERSION for Docker image.
### Why are the changes needed?
Fix: #951
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
By hand.
Co-authored-by: 齐家乐(26731624) <[email protected]>
---
deploy/kubernetes/docker/Dockerfile | 9 +++++----
deploy/kubernetes/docker/build.sh | 4 +++-
deploy/kubernetes/pom.xml | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/deploy/kubernetes/docker/Dockerfile
b/deploy/kubernetes/docker/Dockerfile
index 8538136b..6f665ac0 100644
--- a/deploy/kubernetes/docker/Dockerfile
+++ b/deploy/kubernetes/docker/Dockerfile
@@ -19,6 +19,7 @@ ARG BASE_IMAGE=uniffle-base:latest
FROM ${BASE_IMAGE}
ARG HADOOP_VERSION
+ARG HADOOP_SHORT_VERSION
ARG RSS_VERSION
ARG AUTHOR=unknown
ARG GIT_BRANCH=unknown
@@ -33,11 +34,11 @@ RUN mkdir -p /data/rssadmin/
RUN chown -R rssadmin:rssadmin /data
USER rssadmin
-COPY rss-${RSS_VERSION}.tgz /data/rssadmin
-RUN tar -xvf /data/rssadmin/rss-${RSS_VERSION}.tgz -C /data/rssadmin
-RUN mv /data/rssadmin/rss-${RSS_VERSION} /data/rssadmin/rss
+COPY rss-${RSS_VERSION}-hadoop${HADOOP_SHORT_VERSION}.tgz /data/rssadmin
+RUN tar -xvf
/data/rssadmin/rss-${RSS_VERSION}-hadoop${HADOOP_SHORT_VERSION}.tgz -C
/data/rssadmin
+RUN mv /data/rssadmin/rss-${RSS_VERSION}-hadoop${HADOOP_SHORT_VERSION}
/data/rssadmin/rss
RUN rm /data/rssadmin/rss/bin/rss-env.sh
-RUN rm -rf /data/rssadmin/rss-${RSS_VERSION}.tgz
+RUN rm -rf /data/rssadmin/rss-${RSS_VERSION}-hadoop${HADOOP_SHORT_VERSION}.tgz
COPY rss-env.sh /data/rssadmin/rss/bin
diff --git a/deploy/kubernetes/docker/build.sh
b/deploy/kubernetes/docker/build.sh
index bdc27d67..ea3c88dc 100755
--- a/deploy/kubernetes/docker/build.sh
+++ b/deploy/kubernetes/docker/build.sh
@@ -32,6 +32,7 @@ function exit_with_usage() {
REGISTRY="docker.io/library"
HADOOP_VERSION=2.8.5
+HADOOP_SHORT_VERSION=$(echo $HADOOP_VERSION | awk -F "." '{print $1"."$2}')
AUTHOR=$(whoami)
# If you are based in China, you could pass --apache-mirror <a_mirror_url>
when building this.
APACHE_MIRROR="https://dlcdn.apache.org";
@@ -109,7 +110,7 @@ fi
RSS_DIR=../../..
cd $RSS_DIR || exit
RSS_VERSION=$(mvn help:evaluate -Dexpression=project.version 2>/dev/null |
grep -v "INFO" | grep -v "WARNING" | tail -n 1)
-RSS_FILE=rss-${RSS_VERSION}.tgz
+RSS_FILE=rss-${RSS_VERSION}-hadoop${HADOOP_SHORT_VERSION}.tgz
echo "RSS_VERSION: $RSS_VERSION"
echo "RSS_FILE: $RSS_FILE"
if [ ! -e "$RSS_FILE" ]; \
@@ -127,6 +128,7 @@ echo "building image: $IMAGE"
docker build --network=host -t "$IMAGE" \
--build-arg RSS_VERSION="$RSS_VERSION" \
--build-arg HADOOP_VERSION="$HADOOP_VERSION" \
+ --build-arg HADOOP_SHORT_VERSION="$HADOOP_SHORT_VERSION" \
--build-arg AUTHOR="$AUTHOR" \
--build-arg GIT_COMMIT="$GIT_COMMIT" \
--build-arg GIT_BRANCH="$GIT_BRANCH" \
diff --git a/deploy/kubernetes/pom.xml b/deploy/kubernetes/pom.xml
index cbc81345..808a04bf 100644
--- a/deploy/kubernetes/pom.xml
+++ b/deploy/kubernetes/pom.xml
@@ -54,7 +54,7 @@
<configuration>
<workingDirectory>${basedir}/docker</workingDirectory>
<executable>${basedir}/docker/build.sh</executable>
- <commandlineArgs>--push-image false --hadoop-version
2.10.2</commandlineArgs>
+ <commandlineArgs>--push-image false --hadoop-version
${hadoop.version}</commandlineArgs>
<skip>${skipBuildImage}</skip>
</configuration>
</execution>
