Просмотр исходного кода

Use bundle config to avoid warnings

Akinori MUSHA 3 лет назад
Родитель
Сommit
e98efac373
3 измененных файлов с 9 добавлено и 3 удалено
  1. 3 1
      docker/scripts/setup_env
  2. 3 1
      docker/test/Dockerfile
  3. 3 1
      docker/test/scripts/test_env

+ 3 - 1
docker/scripts/setup_env

@@ -138,7 +138,9 @@ case "${DATABASE_ADAPTER}" in
   *) echo "Unsupported database adapter. Available adapters are mysql2, and postgresql." && exit 1 ;;
 esac
 
-bundle install --without test development --path vendor/bundle
+bundle config set --local path vendor/bundle
+bundle config set --local without 'test development'
+bundle install
 
 # Configure the unicorn server
 sed -r config/unicorn.rb.example \

+ 3 - 1
docker/test/Dockerfile

@@ -19,7 +19,9 @@ RUN apt-get update && \
     curl -Ls https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOM_JS}.tar.bz2 \
       | tar jxvf - --strip-components=2 -C /usr/local/bin/ ${PHANTOM_JS}/bin/phantomjs
 
-RUN LC_ALL=en_US.UTF-8 ON_HEROKU=true bundle install --with test development --path vendor/bundle -j 4
+RUN bundle config set --local path vendor/bundle && \
+    bundle config set --local without 'test development' && \
+    LC_ALL=en_US.UTF-8 ON_HEROKU=true bundle install -j 4
 
 COPY docker/test/scripts/test_env /scripts/
 ENTRYPOINT ["/scripts/test_env"]

+ 3 - 1
docker/test/scripts/test_env

@@ -9,6 +9,8 @@ source /app/.env
 export RAILS_ENV=test
 unset no_proxy
 
-bundle install --with test development --path vendor/bundle -j 4
+bundle config set --local path vendor/bundle
+bundle config set --local without 'test development'
+bundle install -j 4
 bundle exec rake db:create db:migrate
 bundle exec "$@"