Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Signed-off-by: Guanghao Zhang <zghao@apache.org>
(cherry picked from commit e7d1a6a052)
This commit is contained in:
Duo Zhang 2022-11-03 18:06:10 +08:00
parent 4e68f54219
commit 17ad59ea7d
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev-support/Dockerfile
View File

@ -29,5 +29,5 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
curl='7.81.0-*' \ curl='7.81.0-*' \
python3-pip='22.0.2+dfsg-*' \ python3-pip='22.0.2+dfsg-*' \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/* \
RUN pip3 install -r /hbase/dev-support/python-requirements.txt && pip3 install --no-cache-dir -r /hbase/dev-support/python-requirements.txt

22
dev-support/docker/Dockerfile
View File

@ -55,17 +55,17 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -qq update && \
shellcheck='0.8.0-*' \ shellcheck='0.8.0-*' \
&& \ && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/* \
&& \
RUN python3 -mpip install --upgrade pip && \ python3 -mpip install --upgrade pip && \
python3 -mpip install pylint==2.15.5 python3 -mpip install pylint==2.15.5 \
&& \
RUN gem install --no-document \ gem install --no-document \
rake:13.0.3 \ rake:13.0.3 \
rubocop:1.37.1 \ rubocop:1.37.1 \
ruby-lint:2.3.1 ruby-lint:2.3.1 \
&& \
RUN locale-gen en_US.UTF-8 locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8
## ##

21
dev-support/hbase_docker/Dockerfile
View File

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