From 914a55b3bb88ccc03943662a7fe5ed1367509d4c Mon Sep 17 00:00:00 2001 From: emestabillo Date: Sun, 17 Mar 2019 14:23:22 -0400 Subject: [PATCH] Remove yarn installs --- .travis.yml | 2 +- Dockerfile | 2 +- install_cloudnine.sh | 2 +- package.json | 3 --- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91a93d2329..42e32f25bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ install: - netstat -ltpn - docker-compose exec web bash -c "rake db:setup" - docker-compose exec web bash -c "rake db:migrate" - - docker-compose exec web yarn --ignore-engines --ignore-scripts --modules-folder ./public/lib && yarn postinstall + - docker-compose exec web yarn --ignore-engines --ignore-scripts --modules-folder ./public/lib - docker-compose exec web bash -c "rake assets:precompile" - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then gem install danger danger-junit; fi' diff --git a/Dockerfile b/Dockerfile index cc8079da42..ac4ee9ab32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,5 +36,5 @@ RUN bundle install --jobs=4 ADD . /app WORKDIR /app -RUN yarn install && yarn postinstall && yarn upgrade +RUN yarn install && yarn upgrade RUN passenger-config compile-nginx-engine --connect-timeout 60 --idle-timeout 60 diff --git a/install_cloudnine.sh b/install_cloudnine.sh index 7f5c95b32d..fc8386eac7 100755 --- a/install_cloudnine.sh +++ b/install_cloudnine.sh @@ -8,7 +8,7 @@ gem install rails -v 5.2.0 sudo apt-get update sudo apt-get -y install imagemagick ruby-rmagick npm install -g yarn -yarn install && yarn postinstall +yarn install gem install bundler bundle install --without production mysql cp db/schema.rb.example db/schema.rb diff --git a/package.json b/package.json index 4837913449..310312e6bf 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,6 @@ "version": "2.1", "description": "PublicLab.org", "main": "app/assets/javascripts/application.js", - "scripts": { - "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'public/lib', 'junction') } catch (e) { }\"" - }, "repository": { "type": "git", "url": "git+https://github.com/publiclab/plots2.git"