diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2020-09-30 16:18:05 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2020-09-30 16:18:05 +0300 |
| commit | 1f2e0dd8edeb1789c85f4bc9347644e9bf3843ec (patch) | |
| tree | f9252ba05619caacda4bd19dfd8ea8bf26a70bf8 | |
| parent | c039a9b05c6fe5cd2eb4de865ef422858b45ff71 (diff) | |
| parent | c1f703f278726af868311ce07fbe802738e18345 (diff) | |
Merge branch 'revert-8718b2a2' into 'master'
Revert "Drop NOKOGIRI_USE_SYSTEM_LIBRARIES=1 on nokogiri installation"
See merge request gitlab-org/gitlab-docs!1183
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.bootstrap | 2 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.builder.onbuild | 2 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.gitlab-docs-base | 2 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.gitlab-docs-lint | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64f8bde8..a9a81741 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ default: # Check Ruby version and install gems before_script: - ruby -v - - bundle install --jobs 4 --path vendor + - NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 --path vendor .yarn: before_script: 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 |