From e4722ec3cac3aeb3e30aff614f64a46a330707fb Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Tue, 5 Nov 2019 15:37:47 -0600 Subject: [PATCH] Update Node 13 (simplifies ICU) --- docker/build/Dockerfile | 1 - docker/debug/Dockerfile | 1 - script/build/debian/node.sh | 5 ++--- script/debian_setup.sh | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile index 09fcdbc9..e584bc7b 100644 --- a/docker/build/Dockerfile +++ b/docker/build/Dockerfile @@ -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 diff --git a/docker/debug/Dockerfile b/docker/debug/Dockerfile index f4b95f87..72b8d60a 100644 --- a/docker/debug/Dockerfile +++ b/docker/debug/Dockerfile @@ -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 diff --git a/script/build/debian/node.sh b/script/build/debian/node.sh index c013317a..5c084660 100755 --- a/script/build/debian/node.sh +++ b/script/build/debian/node.sh @@ -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 \ No newline at end of file +npm install npm@^6 -g \ No newline at end of file diff --git a/script/debian_setup.sh b/script/debian_setup.sh index d36dfa9c..fdae5405 100755 --- a/script/debian_setup.sh +++ b/script/debian_setup.sh @@ -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