From commits-return-89383-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Sat Sep 14 19:03:38 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8C332180637 for ; Sat, 14 Sep 2019 21:03:38 +0200 (CEST) Received: (qmail 43203 invoked by uid 500); 14 Sep 2019 19:03:37 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 43194 invoked by uid 99); 14 Sep 2019 19:03:37 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Sep 2019 19:03:37 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id BFD4380912; Sat, 14 Sep 2019 19:03:37 +0000 (UTC) Date: Sat, 14 Sep 2019 19:03:37 +0000 To: "commits@hbase.apache.org" Subject: [hbase] branch branch-1 updated: HBASE-23023 upgrade shellcheck used in dockerfile (#625) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156848781742.16256.6411813094223334515@gitbox.apache.org> From: busbey@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hbase X-Git-Refname: refs/heads/branch-1 X-Git-Reftype: branch X-Git-Oldrev: 99e7f60c7d9d91c25ef9138ee3da58d0f00e6a3c X-Git-Newrev: 20d7da50e92dd73fa4b4ac491f32ed19fc257abe X-Git-Rev: 20d7da50e92dd73fa4b4ac491f32ed19fc257abe X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. busbey pushed a commit to branch branch-1 in repository https://gitbox.apache.org/repos/asf/hbase.git The following commit(s) were added to refs/heads/branch-1 by this push: new 20d7da5 HBASE-23023 upgrade shellcheck used in dockerfile (#625) 20d7da5 is described below commit 20d7da50e92dd73fa4b4ac491f32ed19fc257abe Author: Sean Busbey AuthorDate: Sat Sep 14 14:03:32 2019 -0500 HBASE-23023 upgrade shellcheck used in dockerfile (#625) Signed-off-by: stack --- dev-support/docker/Dockerfile | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index b82b23b..e4daee2 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -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 @@ -116,17 +117,6 @@ RUN mkdir -p /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 #### RUN pip install pylint==1.9.2 @@ -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 ###