HBASE-27460 Fix the hadolint errors after HBASE-27456 (apache#4860)

Signed-off-by: Guanghao Zhang <[email protected]> (cherry picked from commit e7d1a6a) (cherry picked from commit b5489fa) Change-Id: I3d8d11276ad1c7e39b69146dab84913c522eb726
vinayakphegde · Nov 3, 2022 · fc0d1a2 · fc0d1a2
1 parent 96740cd
commit fc0d1a2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git a/dev-support/Dockerfile b/dev-support/Dockerfile
@@ -29,5 +29,5 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
       curl='7.81.0-*' \
       python3-pip='22.0.2+dfsg-*' \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-RUN pip3 install -r /hbase/dev-support/python-requirements.txt
+    && rm -rf /var/lib/apt/lists/* \
+    && pip3 install --no-cache-dir -r /hbase/dev-support/python-requirements.txt
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
@@ -55,17 +55,17 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
     shellcheck='0.8.0-*' \
     && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN python3 -mpip install --upgrade pip && \
-  python3 -mpip install pylint==2.15.5
-
-RUN gem install --no-document \
-  rake:13.0.3 \
-  rubocop:1.37.1 \
-  ruby-lint:2.3.1
-
-RUN locale-gen en_US.UTF-8
+    rm -rf /var/lib/apt/lists/* \
+    && \
+    python3 -mpip install --upgrade pip && \
+    python3 -mpip install pylint==2.15.5 \
+    && \
+    gem install --no-document \
+    rake:13.0.3 \
+    rubocop:1.37.1 \
+    ruby-lint:2.3.1 \
+    && \
+    locale-gen en_US.UTF-8
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
 
 ##

diff --git a/dev-support/hbase_docker/Dockerfile b/dev-support/hbase_docker/Dockerfile
@@ -25,9 +25,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
     locales='2.27-*' \
     && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN locale-gen en_US.UTF-8
+    rm -rf /var/lib/apt/lists/* \
+    && \
+    locale-gen en_US.UTF-8
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
 
 FROM BASE_IMAGE AS MAVEN_DOWNLOAD_IMAGE
@@ -74,12 +74,15 @@ ENV PATH "${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${PATH}"
 
 # Pull down HBase and build it into /root/hbase-bin.
 WORKDIR /root
-RUN git clone https://gitbox.apache.org/repos/asf/hbase.git -b master
-RUN mvn clean install -DskipTests assembly:single -f ./hbase/pom.xml
-RUN mkdir -p hbase-bin
-RUN find /root/hbase/hbase-assembly/target -iname '*.tar.gz' -not -iname '*client*' \
-  | head -n 1 \
-  | xargs -I{} tar xzf {} --strip-components 1 -C /root/hbase-bin
+RUN git clone https://gitbox.apache.org/repos/asf/hbase.git -b master \
+    && \
+    mvn clean install -DskipTests assembly:single -f ./hbase/pom.xml \
+    && \
+    mkdir -p hbase-bin \
+    && \
+    find /root/hbase/hbase-assembly/target -iname '*.tar.gz' -not -iname '*client*' \
+    | head -n 1 \
+    | xargs -I{} tar xzf {} --strip-components 1 -C /root/hbase-bin
 
 # Set HBASE_HOME, add it to the path, and start HBase.
 ENV HBASE_HOME /root/hbase-bin