From db9186043e3c760005a5fd95c0fae7bf5ffb392c Mon Sep 17 00:00:00 2001 From: rhymes Date: Fri, 24 Apr 2020 01:23:12 +0200 Subject: [PATCH] Removed yarn integrity check (#7478) --- .travis.yml | 2 +- Dockerfile | 2 +- config/environments/development.rb | 6 ------ docker-compose.yml | 1 - docker-entrypoint.sh | 2 +- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8bd72552..fbf90f191 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ before_install: - sudo systemctl start elasticsearch install: - bundle install --path vendor/bundle - - yarn install + - yarn install --frozen-lockfile - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - chmod +x ./cc-test-reporter diff --git a/Dockerfile b/Dockerfile index 1c808ad64..3958307ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ COPY ./.yarn ./.yarn # Install packages # #------------------------------------------------------------------------------ -RUN yarn install && yarn check --integrity +RUN yarn install # timeout extension required to ensure # system work properly on first time load diff --git a/config/environments/development.rb b/config/environments/development.rb index 4830ddfbc..738ccb63a 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -3,12 +3,6 @@ $VERBOSE = nil Rails.application.configure do - # Verifies that versions and hashed value of the package contents in the project's package.json - # As the integrity check is currently broken under Docker with webpacker, - # we can't enable this flag by default - # see - config.webpacker.check_yarn_integrity = ENV.fetch("YARN_INTEGRITY_ENABLED", "true") == "true" - # Settings specified here will take precedence over those in config/application.rb. # In the development environment your application's code is reloaded on diff --git a/docker-compose.yml b/docker-compose.yml index bf988a3bb..ed0835c1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,6 @@ services: environment: RAILS_ENV: development DATABASE_URL: postgresql://devto:devto@db:5432/PracticalDeveloper_development - YARN_INTEGRITY_ENABLED: "false" ELASTICSEARCH_URL: http://elasticsearch:9200 REDIS_URL: redis://redis:6379 REDIS_SESSIONS_URL: redis://redis:6379 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 25e391595..ba4806833 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -5,7 +5,7 @@ # @TODO - add as scripts instead within /bin? - this will help auto fill? # echo "" > ~/.bashrc -echo "alias devto-setup='cd /usr/src/app/ && gem install bundler && bundle install --jobs 20 --retry 5 && yarn install && yarn check --integrity && bin/setup'" >> ~/.bashrc +echo "alias devto-setup='cd /usr/src/app/ && gem install bundler && bundle install --jobs 20 --retry 5 && yarn install && bin/setup'" >> ~/.bashrc echo "alias devto-migrate='cd /usr/src/app/ && bin/rails db:migrate'" >> ~/.bashrc echo "alias devto-start='cd /usr/src/app/ && bundle exec rails server -b 0.0.0.0 -p 3000'" >> ~/.bashrc