From 8a0ffe1890ae995e80236bbab0d64a75708899a3 Mon Sep 17 00:00:00 2001 From: Tomek Rabczak Date: Mon, 6 Jan 2020 16:37:02 -0600 Subject: [PATCH 1/3] Add imagemagick and unzip packages --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cddf206f2c..daa7e2a192 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 # Install all the requirements -RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev libssl1.0-dev libreadline-dev libyaml-dev libffi-dev libxml2-dev libxslt1-dev wait-for-it +RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev libssl1.0-dev libreadline-dev libyaml-dev libffi-dev libxml2-dev libxslt1-dev wait-for-it imagemagick unzip # Setup ENV variables ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:$PATH From 0ec0d3fd817d730e660bcf37500a51ac9013979a Mon Sep 17 00:00:00 2001 From: Tomek Rabczak Date: Mon, 6 Jan 2020 16:37:23 -0600 Subject: [PATCH 2/3] Install Chrome and Chromedriver --- Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Dockerfile b/Dockerfile index daa7e2a192..fa7718f2ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,4 +27,15 @@ RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' apt-get update && \ apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev +# Install Chrome +RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \ + sh -c "echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list.d/google-chrome.list" && \ + apt-get update && \ + apt-get install -fy google-chrome-stable + +# Install Chromedriver +RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip && \ + unzip chromedriver_linux64.zip -d /usr/bin && \ + chmod u+x /usr/bin/chromedriver + COPY . /usr/src/app/ From 8df0e2c66edcedb9595c67bda7d908736c3bc4c5 Mon Sep 17 00:00:00 2001 From: Tomek Rabczak Date: Mon, 6 Jan 2020 16:37:52 -0600 Subject: [PATCH 3/3] Move db:test:prepare task after db:reset is run --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 647e1d91c6..5025cfd929 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,8 +30,8 @@ services: command: > bash -c "(bundle check || bundle install) && wait-for-it -t 30 db:5432 && - bundle exec rake db:reset db:test:prepare && - bundle exec rake ofn:sample_data || true && + bundle exec rake db:reset && + bundle exec rake db:test:prepare ofn:sample_data || true && rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"