Skip to content

Commit 17ad59e

Browse files
committed
HBASE-27460 Fix the hadolint errors after HBASE-27456 (#4860)
Signed-off-by: Guanghao Zhang <[email protected]> (cherry picked from commit e7d1a6a)
1 parent 4e68f54 commit 17ad59e

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

dev-support/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
2929
curl='7.81.0-*' \
3030
python3-pip='22.0.2+dfsg-*' \
3131
&& apt-get clean \
32-
&& rm -rf /var/lib/apt/lists/*
33-
RUN pip3 install -r /hbase/dev-support/python-requirements.txt
32+
&& rm -rf /var/lib/apt/lists/* \
33+
&& pip3 install --no-cache-dir -r /hbase/dev-support/python-requirements.txt

dev-support/docker/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
5555
shellcheck='0.8.0-*' \
5656
&& \
5757
apt-get clean && \
58-
rm -rf /var/lib/apt/lists/*
59-
60-
RUN python3 -mpip install --upgrade pip && \
61-
python3 -mpip install pylint==2.15.5
62-
63-
RUN gem install --no-document \
64-
rake:13.0.3 \
65-
rubocop:1.37.1 \
66-
ruby-lint:2.3.1
67-
68-
RUN locale-gen en_US.UTF-8
58+
rm -rf /var/lib/apt/lists/* \
59+
&& \
60+
python3 -mpip install --upgrade pip && \
61+
python3 -mpip install pylint==2.15.5 \
62+
&& \
63+
gem install --no-document \
64+
rake:13.0.3 \
65+
rubocop:1.37.1 \
66+
ruby-lint:2.3.1 \
67+
&& \
68+
locale-gen en_US.UTF-8
6969
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
7070

7171
##

dev-support/hbase_docker/Dockerfile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
2525
locales='2.27-*' \
2626
&& \
2727
apt-get clean && \
28-
rm -rf /var/lib/apt/lists/*
29-
30-
RUN locale-gen en_US.UTF-8
28+
rm -rf /var/lib/apt/lists/* \
29+
&& \
30+
locale-gen en_US.UTF-8
3131
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
3232

3333
FROM BASE_IMAGE AS MAVEN_DOWNLOAD_IMAGE
@@ -74,12 +74,15 @@ ENV PATH "${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${PATH}"
7474

7575
# Pull down HBase and build it into /root/hbase-bin.
7676
WORKDIR /root
77-
RUN git clone https://gitbox.apache.org/repos/asf/hbase.git -b master
78-
RUN mvn clean install -DskipTests assembly:single -f ./hbase/pom.xml
79-
RUN mkdir -p hbase-bin
80-
RUN find /root/hbase/hbase-assembly/target -iname '*.tar.gz' -not -iname '*client*' \
81-
| head -n 1 \
82-
| xargs -I{} tar xzf {} --strip-components 1 -C /root/hbase-bin
77+
RUN git clone https://gitbox.apache.org/repos/asf/hbase.git -b master \
78+
&& \
79+
mvn clean install -DskipTests assembly:single -f ./hbase/pom.xml \
80+
&& \
81+
mkdir -p hbase-bin \
82+
&& \
83+
find /root/hbase/hbase-assembly/target -iname '*.tar.gz' -not -iname '*client*' \
84+
| head -n 1 \
85+
| xargs -I{} tar xzf {} --strip-components 1 -C /root/hbase-bin
8386

8487
# Set HBASE_HOME, add it to the path, and start HBase.
8588
ENV HBASE_HOME /root/hbase-bin

0 commit comments

Comments
 (0)