Skip to content

Commit

Permalink
Remove unused dependencies for ARM (nodegit and ctags)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmb12686 authored May 30, 2020
1 parent e433965 commit 55b8a3b
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ RUN set -x \
&& mv node-v10.15.2-linux-armv6l /opt/kibana/node ; fi


RUN set -x \
&& if [ "${TARGETPLATFORM}" = "linux/arm/v7" ] ; then git clone --branch v0.25.0 --depth 1 https://github.com/nodegit/nodegit.git \
&& cd /nodegit \
&& wget https://github.com/fg2it/phantomjs-on-raspberry/releases/download/v2.1.1-wheezy-jessie-armv6/phantomjs \
&& export PATH=$PATH:/nodegit:/opt/kibana/node/bin/ \
&& chmod -R 777 /nodegit ; fi
#RUN set -x \
# && if [ "${TARGETPLATFORM}" = "linux/arm/v7" ] ; then git clone --branch v0.25.0 --depth 1 https://github.com/nodegit/nodegit.git \
# && cd /nodegit \
# && wget https://github.com/fg2it/phantomjs-on-raspberry/releases/download/v2.1.1-wheezy-jessie-armv6/phantomjs \
# && export PATH=$PATH:/nodegit:/opt/kibana/node/bin/ \
# && chmod -R 777 /nodegit ; fi
# && /opt/kibana/node/bin/npm install --unsafe-perm ; fi

# RUN set -x \
Expand All @@ -94,15 +94,15 @@ RUN set -x \
# && cp -rf /nodegit/build/Release /opt/kibana/node_modules/@elastic/nodegit/build \
# && cp /nodegit/dist/enums.js /opt/kibana/node_modules/@elastic/nodegit/dist ; fi

RUN set -x \
&& if [ "${TARGETPLATFORM}" = "linux/arm/v7" ] ; then cd /nodegit \
&& export PATH=$PATH:/nodegit:/opt/kibana/node/bin/ \
&& /opt/kibana/node/bin/npm install ctags --unsafe-perm ; fi
#RUN set -x \
# && if [ "${TARGETPLATFORM}" = "linux/arm/v7" ] ; then cd /nodegit \
# && export PATH=$PATH:/nodegit:/opt/kibana/node/bin/ \
# && /opt/kibana/node/bin/npm install ctags --unsafe-perm ; fi

RUN set -x \
&& if [ "${TARGETPLATFORM}" = "linux/arm/v7" ] ; then mv /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-x64 /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-arm \
&& mv /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-arm/ctags.node /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-arm/ctags.node.old \
&& cp /nodegit/node_modules/ctags/build/Release/ctags.node /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-arm ; fi
#RUN set -x \
# && if [ "${TARGETPLATFORM}" = "linux/arm/v7" ] ; then mv /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-x64 /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-arm \
# && mv /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-arm/ctags.node /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-arm/ctags.node.old \
# && cp /nodegit/node_modules/ctags/build/Release/ctags.node /opt/kibana/node_modules/@elastic/node-ctags/ctags/build/ctags-node-v64-linux-arm ; fi


USER ${KIBANA_UID}
Expand Down

0 comments on commit 55b8a3b

Please sign in to comment.