From 5c9a56d906a53af2cd87040705ccbb42bf873f3e Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Thu, 6 Feb 2020 11:19:15 +0100 Subject: [PATCH] Removed node6 and updated modules to Node 10 (#135) --- Dockerfile-base | 9 --------- runit/filestore-sharelatex/run | 2 +- runit/real-time-sharelatex/run | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Dockerfile-base b/Dockerfile-base index 2cff8a830f..14b9550ed1 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -28,15 +28,6 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | sudo bash - RUN apt-get install -y nodejs RUN npm install -g grunt-cli - -# Install Node6 (required by some services) -# ----------------------------------------- -RUN wget https://nodejs.org/dist/v6.17.1/node-v6.17.1-linux-x64.tar.gz && \ - mkdir -p /opt/nodejs && tar -xzf node-v6.17.1-linux-x64.tar.gz -C /opt/nodejs/ && \ - cd /opt/nodejs && mv node-v6.17.1-linux-x64 6.17.1 && \ - ln -s /opt/nodejs/6.17.1/bin/node /usr/bin/node6 - - # Install TexLive # --------------- RUN wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz && \ diff --git a/runit/filestore-sharelatex/run b/runit/filestore-sharelatex/run index 1ba126dda0..4237a38793 100755 --- a/runit/filestore-sharelatex/run +++ b/runit/filestore-sharelatex/run @@ -1,3 +1,3 @@ #!/bin/bash export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee -exec /sbin/setuser www-data /usr/bin/node6 /var/www/sharelatex/filestore/app.js >> /var/log/sharelatex/filestore.log 2>&1 +exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/filestore/app.js >> /var/log/sharelatex/filestore.log 2>&1 diff --git a/runit/real-time-sharelatex/run b/runit/real-time-sharelatex/run index 1d00837def..ad005b624c 100755 --- a/runit/real-time-sharelatex/run +++ b/runit/real-time-sharelatex/run @@ -1,3 +1,3 @@ #!/bin/bash export SHARELATEX_CONFIG=/etc/sharelatex/settings.coffee -exec /sbin/setuser www-data /usr/bin/node6 /var/www/sharelatex/real-time/app.js >> /var/log/sharelatex/real-time.log 2>&1 +exec /sbin/setuser www-data /usr/bin/node /var/www/sharelatex/real-time/app.js >> /var/log/sharelatex/real-time.log 2>&1