Skip to content

Commit

Permalink
Fix yarn paths
Browse files Browse the repository at this point in the history
  • Loading branch information
icarito committed May 17, 2019
1 parent 4f95ea1 commit 3a9ed3c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -31,7 +31,7 @@ install:
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then gem install danger danger-junit; fi'

script:
- docker-compose exec web bash -c "apt install -y phantomjs && yarn"
- docker-compose exec web bash -c "apt install -y phantomjs"
- docker-compose exec web bash -c "wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
- docker-compose exec web bash -c "dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install"
- docker-compose exec web bash -c "wget https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip" # https://sites.google.com/a/chromium.org/chromedriver/
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile
Expand Up @@ -16,21 +16,22 @@ RUN echo \
> /etc/apt/sources.list

# Install dependencies
WORKDIR /tmp
ADD nodesource.gpg.key /tmp/nodesource.gpg.key
RUN apt-key add nodesource.gpg.key && apt-get update -qq \
RUN apt-key add /tmp/nodesource.gpg.key && apt-get update -qq \
&& apt-get install --no-install-recommends -y build-essential libmariadbclient-dev \
wget curl procps cron make nodejs \
apt-transport-https libfreeimage3
RUN npm config set strict-ssl false && npm install -g yarn \
&& yarn install && yarn upgrade

# Install bundle of gems
WORKDIR /tmp
ADD Gemfile /tmp/Gemfile
ADD Gemfile.lock /tmp/Gemfile.lock
RUN bundle install --jobs=4

ADD . /app
WORKDIR /app

RUN npm config set strict-ssl false && npm install -g yarn \
&& yarn install && yarn upgrade

# RUN passenger-config compile-nginx-engine --connect-timeout 60 --idle-timeout 60

0 comments on commit 3a9ed3c

Please sign in to comment.