From 2ca28de6c7a929007de8344927a812f9e3e08d09 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Tue, 1 Sep 2020 01:52:56 +0000
Subject: Drop NOKOGIRI_USE_SYSTEM_LIBRARIES=1 on nokogiri installation

Removes libxml2, libxml2-dev, libxslt, libxslt-dev packages from the base image.

libxml2/libxml2-dev are implicitly required by libxslt/libxslt-dev

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
---
 dockerfiles/Dockerfile.bootstrap        | 2 +-
 dockerfiles/Dockerfile.builder.onbuild  | 2 +-
 dockerfiles/Dockerfile.gitlab-docs-base | 2 --
 dockerfiles/Dockerfile.gitlab-docs-lint | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'dockerfiles')

diff --git a/dockerfiles/Dockerfile.bootstrap b/dockerfiles/Dockerfile.bootstrap
index 9dfdd857..3071e0a6 100644
--- a/dockerfiles/Dockerfile.bootstrap
+++ b/dockerfiles/Dockerfile.bootstrap
@@ -22,7 +22,7 @@ COPY /yarn.lock /source/
 WORKDIR /source
 
 # Install gems
-RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4
+RUN bundle install --jobs 4
 # Install node libraries
 RUN yarn install
 
diff --git a/dockerfiles/Dockerfile.builder.onbuild b/dockerfiles/Dockerfile.builder.onbuild
index 48491a23..902c687a 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 NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4
+ONBUILD RUN 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 99b85580..789ffe05 100644
--- a/dockerfiles/Dockerfile.gitlab-docs-base
+++ b/dockerfiles/Dockerfile.gitlab-docs-base
@@ -14,8 +14,6 @@ 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 5ff65568..2eb6a0aa 100644
--- a/dockerfiles/Dockerfile.gitlab-docs-lint
+++ b/dockerfiles/Dockerfile.gitlab-docs-lint
@@ -49,4 +49,4 @@ RUN wget https://gitlab.com/gitlab-org/gitlab-docs/-/archive/$CI_COMMIT_REF_NAME
 
 RUN cd gitlab-docs \
   && yarn install --frozen-lockfile \
-  && NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4
+  && bundle install --jobs 4
-- 
cgit v1.2.3