Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2020-02-23 12:40:19 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2020-02-23 12:40:19 +0300
commitac96f6ff6775c64427c4e4d74eef3edb5f818b17 (patch)
tree6a36bbc8ef08c5f0c65617ac7ebbc8c4fa1a2b0a /dockerfiles
parentadb300fb6f11a481689df1800e06fb7d3e43fe1d (diff)
Run yarn before Nanoc compile
Also remove the step that removes the tmp dir as this won't be included in the resulting image anyway.
Diffstat (limited to 'dockerfiles')
-rw-r--r--dockerfiles/Dockerfile.builder.onbuild6
1 files changed, 2 insertions, 4 deletions
diff --git a/dockerfiles/Dockerfile.builder.onbuild b/dockerfiles/Dockerfile.builder.onbuild
index 305be286..48491a23 100644
--- a/dockerfiles/Dockerfile.builder.onbuild
+++ b/dockerfiles/Dockerfile.builder.onbuild
@@ -15,14 +15,12 @@ ONBUILD COPY . /source/
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
ONBUILD RUN bundle exec nanoc compile -VV
# Move generated HTML to /site
ONBUILD RUN mkdir /site
-ONBUILD RUN mv /source/public /site/${VER}
-
-# Remove tmp dir to save some space
-ONBUILD RUN rm -rf /source/tmp
+ONBUILD RUN mv public /site/${VER}
# Do some HTML post-processing on the archive
ONBUILD RUN [ -f /scripts/normalize-links.sh ] && /scripts/normalize-links.sh /site ${VER} || "/scripts/normalize-links.sh not found"