diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2020-01-22 15:40:18 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2020-01-22 15:40:18 +0300 |
commit | 243d9f3a23623eddc7baa669daf2de5f7ee208f9 (patch) | |
tree | 7fed35e5c4e1c89411ebfc0f6c0f832910d6b63b | |
parent | 5a470beb498630b91384ae56a33f4ca15595a7f8 (diff) | |
parent | 89328a33ca0c46a4871f5adb89a9465184a338c5 (diff) |
Merge branch 'master' into 12.7
-rw-r--r-- | dockerfiles/Dockerfile.bootstrap | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dockerfiles/Dockerfile.bootstrap b/dockerfiles/Dockerfile.bootstrap index 14f07120..d65697b0 100644 --- a/dockerfiles/Dockerfile.bootstrap +++ b/dockerfiles/Dockerfile.bootstrap @@ -16,12 +16,15 @@ RUN export GO111MODULE=on \ # FROM registry.gitlab.com/gitlab-org/gitlab-docs:base -# Copy only Gemfile and Gemfile.lock +# Copy only the Gemfiles and yarn.lock to install the dependencies COPY /Gemfile* /source/ +COPY /yarn.lock /source/ WORKDIR /source # Install gems RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 +# Install node libraries +RUN yarn install # Copy scripts used for static HTML post-processing COPY scripts /scripts/ |