From ab3a416cfc56ccf5a71e9262298d581204859316 Mon Sep 17 00:00:00 2001 From: Abenet Tamiru Date: Wed, 15 Apr 2020 15:55:01 +0200 Subject: [PATCH] Respect .yarnrc in Dockerfile (#7297) --- Dockerfile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d709e9e9..1c808ad64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM ruby:2.7.1-alpine3.10 #------------------------------------------------------------------------------ RUN apk update -qq && apk add git nodejs postgresql-client ruby-dev build-base \ less libxml2-dev libxslt-dev pcre-dev libffi-dev postgresql-dev tzdata imagemagick \ - libcurl curl-dev + libcurl curl-dev yarn #------------------------------------------------------------------------------ # @@ -16,15 +16,6 @@ RUN apk update -qq && apk add git nodejs postgresql-client ruby-dev build-base \ #------------------------------------------------------------------------------ RUN gem install bundler:2.1.4 -#------------------------------------------------------------------------------ -# -# Install Yarn -# -#------------------------------------------------------------------------------ -ENV PATH=/root/.yarn/bin:$PATH -RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - yarn - #------------------------------------------------------------------------------ # # Define working directory @@ -46,7 +37,8 @@ RUN bundle install --jobs 20 --retry 5 # Copy Package.json and yarn.lock # #------------------------------------------------------------------------------ -COPY ./package.json ./yarn.lock ./ +COPY ./package.json ./yarn.lock ./.yarnrc ./ +COPY ./.yarn ./.yarn #------------------------------------------------------------------------------ #