diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2021-03-01 15:40:19 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2021-03-19 13:05:37 +0300 |
| commit | affb046528285049509a38a23af0dbcc6e44b355 (patch) | |
| tree | ccf92df1898c77c1059209c22ed0dbd9604e5edc /dockerfiles | |
| parent | b912f3542568ec70a0e762cdb9d15de2349ab3b7 (diff) | |
Make readme symlinks work on stable branches
https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/1499
didn't account for the stable branches, and we now have
redirect loops. This commit fixes that by using the
'symlink_readmes' raketask for the branches that have it
and the old method for old branches.
Diffstat (limited to 'dockerfiles')
| -rw-r--r-- | dockerfiles/Dockerfile.builder.onbuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dockerfiles/Dockerfile.builder.onbuild b/dockerfiles/Dockerfile.builder.onbuild index 48491a23..d030abed 100644 --- a/dockerfiles/Dockerfile.builder.onbuild +++ b/dockerfiles/Dockerfile.builder.onbuild @@ -17,6 +17,10 @@ ONBUILD RUN yarn install ONBUILD RUN bundle exec rake setup_git default ONBUILD RUN yarn install ONBUILD RUN bundle exec nanoc compile -VV +## For 13.9 and later, there's a raketask that is run instead of the +## manual READMEs symlinking that is defined in scripts/normalize-links.sh. +## If the raketask is present, run it. +ONBUILD RUN [ -f /scripts/check_symlinks.sh ] && /scripts/check_symlinks.sh || "/scripts/check_symlinks.sh not found" # Move generated HTML to /site ONBUILD RUN mkdir /site |