diff options
| author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2022-05-23 06:31:02 +0300 |
|---|---|---|
| committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2022-05-23 06:31:02 +0300 |
| commit | d7fc80a6294244116cd25ae60b9a174f50aaff16 (patch) | |
| tree | 7d87c00c6a1d7ce5607068d7a717b73586ea3576 | |
| parent | b1b77af68f51394f96ad22b45b3ef87dfc468521 (diff) | |
Remove the legacy variable around Nokogiri build963-update-nokogiri-to-1.11.2-gl15
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | dockerfiles/bootstrap.Dockerfile | 2 | ||||
| -rw-r--r-- | dockerfiles/builder.onbuild.Dockerfile | 2 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-lint-html.Dockerfile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9039f754..ecb1f54e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ default: - gem -v - bundle -v - bundle config set --local deployment true # Install dependencies into ./vendor/ruby - - NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 + - bundle install --jobs 4 .yarn: before_script: diff --git a/dockerfiles/bootstrap.Dockerfile b/dockerfiles/bootstrap.Dockerfile index aba59541..e7cbda94 100644 --- a/dockerfiles/bootstrap.Dockerfile +++ b/dockerfiles/bootstrap.Dockerfile @@ -22,7 +22,7 @@ COPY /yarn.lock /source/ WORKDIR /source # Install gems and node libraries -RUN NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 && \ +RUN bundle install --jobs 4 && \ yarn install && \ yarn cache clean diff --git a/dockerfiles/builder.onbuild.Dockerfile b/dockerfiles/builder.onbuild.Dockerfile index 94faeb84..0a7795c6 100644 --- a/dockerfiles/builder.onbuild.Dockerfile +++ b/dockerfiles/builder.onbuild.Dockerfile @@ -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 && yarn cache clean ONBUILD RUN bundle exec rake setup_git default ONBUILD RUN bundle exec nanoc compile -VV diff --git a/dockerfiles/gitlab-docs-lint-html.Dockerfile b/dockerfiles/gitlab-docs-lint-html.Dockerfile index 003146cd..fdb0d2fe 100644 --- a/dockerfiles/gitlab-docs-lint-html.Dockerfile +++ b/dockerfiles/gitlab-docs-lint-html.Dockerfile @@ -54,4 +54,4 @@ WORKDIR /tmp/gitlab-docs/ RUN yarn install --frozen-lockfile \ && yarn cache clean --all \ && bundle update --bundler \ - && NOKOGIRI_USE_SYSTEM_LIBRARIES=1 bundle install --jobs 4 + && bundle install --jobs 4 |