diff --git a/Dockerfile b/Dockerfile index 0511c1a16..e5a0eb630 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG WKHTMLTOPDF_PACKAGE_URL=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/ RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - && \ echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list && \ - wget -O /usr/bin/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/77.0.3865.40/chromedriver_linux64.zip && \ + wget -q -O /usr/bin/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_linux64.zip && \ unzip /usr/bin/chromedriver_linux64.zip -d /usr/bin/ # additional dependecies @@ -24,7 +24,7 @@ RUN apt-get update -qq && \ sudo graphviz --no-install-recommends \ libreoffice \ libfile-mimeinfo-perl \ - google-chrome-stable=77.* && \ + google-chrome-stable=78.* && \ wget -q -O /tmp/wkhtmltox_amd64.deb $WKHTMLTOPDF_PACKAGE_URL && \ apt-get install -y /tmp/wkhtmltox_amd64.deb && \ rm /tmp/wkhtmltox_amd64.deb && \ diff --git a/Makefile b/Makefile index 7e3a6484f..1f04d99d2 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ tests-ci: @docker-compose run --rm web bash -c "bundle install && yarn install" @docker-compose up -d webpack @docker-compose ps - @docker-compose run -e ENABLE_EMAIL_CONFIRMATIONS=false -e MAIL_FROM=MAIL_FROM -e MAIL_REPLYTO=MAIL_REPLYTO -e RAILS_ENV=test -e PAPERCLIP_HASH_SECRET=PAPERCLIP_HASH_SECRET -e MAIL_SERVER_URL=localhost:3000 -e ENABLE_RECAPTCHA=false -e ENABLE_USER_CONFIRMATION=false -e ENABLE_USER_REGISTRATION=true -e CORE_API_RATE_LIMIT=1000000 --rm web bash -c "rake db:create db:migrate && rake db:migrate && yarn install && bundle exec rspec && bundle exec cucumber" + @docker-compose run -e ENABLE_EMAIL_CONFIRMATIONS=false -e MAIL_FROM=MAIL_FROM -e MAIL_REPLYTO=MAIL_REPLYTO -e RAILS_ENV=test -e PAPERCLIP_HASH_SECRET=PAPERCLIP_HASH_SECRET -e MAIL_SERVER_URL=localhost:3000 -e ENABLE_RECAPTCHA=false -e ENABLE_USER_CONFIRMATION=false -e ENABLE_USER_REGISTRATION=true -e CORE_API_RATE_LIMIT=1000000 --rm web bash -c "rake db:create && rake db:migrate && yarn install && bundle exec rspec && bundle exec cucumber" console: @$(MAKE) rails cmd="rails console"