diff options
| author | Vasilii Iakliushin <viakliushin@gitlab.com> | 2020-09-22 16:37:10 +0300 |
|---|---|---|
| committer | Vasilii Iakliushin <viakliushin@gitlab.com> | 2020-09-22 16:37:10 +0300 |
| commit | 8718b2a2e37450f709c109248daabd00bf9f551e (patch) | |
| tree | d7698801954e1f55b975a666a9d670053c84f079 /dockerfiles | |
| parent | 4906e0339c9bfa2e7e712f2de945314e62b8f507 (diff) | |
| parent | 2ca28de6c7a929007de8344927a812f9e3e08d09 (diff) | |
Merge branch '846-basic-installation-of-nokogiri' into 'master'
Drop NOKOGIRI_USE_SYSTEM_LIBRARIES=1 on nokogiri installation
Closes #846
See merge request gitlab-org/gitlab-docs!1111
Diffstat (limited to 'dockerfiles')
| -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 |
4 files changed, 3 insertions, 5 deletions
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 d3d5c002..b3da78e7 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-base +++ b/dockerfiles/Dockerfile.gitlab-docs-base @@ -15,8 +15,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 252d28bd..aacc9711 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 \ - && NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 + && bundle install --jobs 4 |