Skip to content

Commit

Permalink
HBASE-23023 upgrade shellcheck used in dockerfile (#625)
Browse files Browse the repository at this point in the history
Signed-off-by: stack <stack@apache.org>
  • Loading branch information
busbey authored Sep 14, 2019
1 parent 99e7f60 commit 20d7da5
Showing 1 changed file with 19 additions and 11 deletions.
30 changes: 19 additions & 11 deletions dev-support/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
python-pip \
rsync \
snappy \
xz-utils \
zlib1g-dev \
wget

Expand Down Expand Up @@ -115,17 +116,6 @@ RUN mkdir -p /opt/findbugs && \
tar xzf /opt/findbugs.tar.gz --strip-components 1 -C /opt/findbugs
ENV FINDBUGS_HOME /opt/findbugs

####
# Install shellcheck
####
RUN apt-get -q install -y cabal-install
RUN mkdir /root/.cabal
RUN echo "remote-repo: hackage.fpcomplete.com:http://hackage.fpcomplete.com/" >> /root/.cabal/config
#RUN echo "remote-repo: hackage.haskell.org:http://hackage.haskell.org/" > /root/.cabal/config
RUN echo "remote-repo-cache: /root/.cabal/packages" >> /root/.cabal/config
RUN cabal update
RUN cabal install shellcheck --global

####
# Install pylint
####
Expand Down Expand Up @@ -157,6 +147,24 @@ RUN gem install rubocop
###
RUN gem install ruby-lint

####
# Install shellcheck
#
# Include workaround for static linking bug
# https://github.com/koalaman/shellcheck/issues/1053
###
RUN mkdir -p /opt/shellcheck && \
curl -L -s -S \
https://storage.googleapis.com/shellcheck/shellcheck-stable.linux.x86_64.tar.xz \
-o /opt/shellcheck.tar.xz && \
tar xJf /opt/shellcheck.tar.xz --strip-components 1 -C /opt/shellcheck && \
touch /tmp/libc.so.6 && \
echo '#!/bin/bash\n\
LD_LIBRARY_PATH=/tmp /opt/shellcheck/shellcheck $@'\
> /usr/bin/shellcheck && \
chmod +x /usr/bin/shellcheck && \
rm -f /opt/shellcheck.tar.xz

###
# Avoid out of memory errors in builds
###
Expand Down

0 comments on commit 20d7da5

Please sign in to comment.