Commit 2edbc02d authored by Marcia Ramos's avatar Marcia Ramos 🌴

Merge branch 'release-12-1' into 'master'

Release 12.1

See merge request !492
parents 3b6bcb0e ed50a746
Pipeline #76732009 passed with stages
in 2 minutes and 51 seconds
......@@ -31,9 +31,9 @@ RUN rm -rf /usr/share/nginx/html/*
# Get all the archive static HTML and put it into place
# Copy the versions found in 'content/_data/versions.yaml' under online.
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.1 ${TARGET} ${TARGET}
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.0 ${TARGET} ${TARGET}
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET}
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.10 ${TARGET} ${TARGET}
# Get the built docs output from the previous build stage
# This ordering means all previous layers can come from cache unless an archive
......
......@@ -39,7 +39,7 @@ searchbar: false
<script type="text/javascript">
// Redirect to /archives on a non-existing versions
// Place here all offline versions as seen inside content/_data/versions.yaml
if (/10.3|10.4|10.5|10.6|10.7|10.8|11.0|11.1|11.2|11.3|11.4|11.5|11.6|11.7|11.8|11.9/.test(window.location.href)) {
if (/10.3|10.4|10.5|10.6|10.7|10.8|11.0|11.1|11.2|11.3|11.4|11.5|11.6|11.7|11.8|11.9|11.10/.test(window.location.href)) {
window.location.replace("https://docs.gitlab.com/archives");
}
</script>
......
# The first online version should always point to the
# current stable version.
online:
- "12.1"
- "12.0"
- "11.11"
- "11.10"
offline:
- "11.10"
- "11.9"
- "11.8"
- "11.7"
......
......@@ -7,6 +7,7 @@ ENV TARGET=/usr/share/nginx/html
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
# Get all the archive static HTML and put it into place
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.1 ${TARGET} ${TARGET}
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:12.0 ${TARGET} ${TARGET}
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.11 ${TARGET} ${TARGET}
COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:11.10 ${TARGET} ${TARGET}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment