From c1f703f278726af868311ce07fbe802738e18345 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Thu, 24 Sep 2020 09:41:12 +0000 Subject: Revert "Merge branch '846-basic-installation-of-nokogiri' into 'master'" This reverts merge request !1111 --- dockerfiles/Dockerfile.bootstrap | 2 +- dockerfiles/Dockerfile.builder.onbuild | 2 +- dockerfiles/Dockerfile.gitlab-docs-base | 2 ++ dockerfiles/Dockerfile.gitlab-docs-lint | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'dockerfiles') diff --git a/dockerfiles/Dockerfile.bootstrap b/dockerfiles/Dockerfile.bootstrap index 3071e0a6..9dfdd857 100644 --- a/dockerfiles/Dockerfile.bootstrap +++ b/dockerfiles/Dockerfile.bootstrap @@ -22,7 +22,7 @@ COPY /yarn.lock /source/ WORKDIR /source # Install gems -RUN bundle install --jobs 4 +RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 # Install node libraries RUN yarn install diff --git a/dockerfiles/Dockerfile.builder.onbuild b/dockerfiles/Dockerfile.builder.onbuild index 902c687a..48491a23 100644 --- a/dockerfiles/Dockerfile.builder.onbuild +++ b/dockerfiles/Dockerfile.builder.onbuild @@ -12,7 +12,7 @@ ONBUILD ARG BRANCH_CHARTS # Build the docs from this branch ONBUILD COPY . /source/ -ONBUILD RUN bundle install --jobs 4 +ONBUILD RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 ONBUILD RUN yarn install ONBUILD RUN bundle exec rake setup_git default ONBUILD RUN yarn install diff --git a/dockerfiles/Dockerfile.gitlab-docs-base b/dockerfiles/Dockerfile.gitlab-docs-base index b3da78e7..d3d5c002 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-base +++ b/dockerfiles/Dockerfile.gitlab-docs-base @@ -15,6 +15,8 @@ RUN apk add --no-cache -U \ gzip \ grep \ libcurl \ + libxslt \ + libxslt-dev \ nodejs \ openssl \ pngquant \ diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint b/dockerfiles/Dockerfile.gitlab-docs-lint index aacc9711..252d28bd 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-lint +++ b/dockerfiles/Dockerfile.gitlab-docs-lint @@ -44,4 +44,4 @@ RUN wget https://gitlab.com/gitlab-org/gitlab-docs/-/archive/$CI_COMMIT_REF_NAME RUN cd gitlab-docs \ && yarn install --frozen-lockfile \ - && bundle install --jobs 4 + && NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 -- cgit v1.2.3