Merge branch 'update_node' into rails-v5

This commit is contained in:
Eric Schultz 2019-11-05 15:38:09 -06:00
commit cd2e75560c
4 changed files with 3 additions and 6 deletions

View file

@ -14,6 +14,5 @@ WORKDIR /myapp
COPY Gemfile /myapp/Gemfile
COPY Gemfile.lock /myapp/Gemfile.lock
RUN bundle install
ENV NODE_ICU_DATA=/usr/lib/node_modules/icu4c-data
CMD rake -T

View file

@ -26,5 +26,4 @@ RUN chown -R $USER /usr/local/bundle
RUN chgrp -R $USER /usr/local/bundle
USER $USER
EXPOSE 5000
ENV NODE_ICU_DATA=/usr/lib/node_modules/icu4c-data
CMD foreman start

View file

@ -1,6 +1,5 @@
#!/usr/bin/env bash
set -e
curl -sL https://deb.nodesource.com/setup_10.x | bash -
curl -sL https://deb.nodesource.com/setup_13.x | bash -
apt-get update -qq && apt-get install -y nodejs
npm install npm@^6 -g
npm install -g icu4c-data@64l
npm install npm@^6 -g

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e
curl -sL https://deb.nodesource.com/setup_9.x | bash -
curl -sL https://deb.nodesource.com/setup_13.x | bash -
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs postgresql-9.6 default-jre