diff options
| author | Evan Read <eread@gitlab.com> | 2021-02-23 12:05:45 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2021-02-23 12:05:45 +0300 |
| commit | 621d44a22fb35f884eab6ff83f117caf699d9280 (patch) | |
| tree | 490875ec47d368bfb923e96b56f77aa6c0fd8da3 | |
| parent | 45195db991e16bac4ec545bbc4ad01a571ad9b95 (diff) | |
| parent | bd0af4b08ef83ca4bead6a9ff1a75f45692a379f (diff) | |
Merge branch 'release-13-9' into 'master'
Release 13.9
See merge request gitlab-org/gitlab-docs!1555
| -rw-r--r-- | Dockerfile.master | 2 | ||||
| -rw-r--r-- | content/_data/versions.yaml | 3 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.archives | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile.master b/Dockerfile.master index 50f997fc..c740ff7b 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -45,9 +45,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:13.9 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.8 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.7 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.6 ${TARGET} ${TARGET} # List the two last major versions # Copy the versions found in 'content/_data/versions.yaml' under previous_majors diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml index 15e2a57d..3aceeaf6 100644 --- a/content/_data/versions.yaml +++ b/content/_data/versions.yaml @@ -7,13 +7,14 @@ previous_majors: # The first online version should always point to the # current stable version. online: + - "13.9" - "13.8" - "13.7" - - "13.6" # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "13.6" - "13.5" - "13.4" - "13.3" diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index 4aafaffb..4680c2ae 100644 --- a/dockerfiles/Dockerfile.archives +++ b/dockerfiles/Dockerfile.archives @@ -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:13.9 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.8 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.7 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.6 ${TARGET} ${TARGET} |