diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2020-09-22 10:58:50 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2020-09-22 10:58:50 +0300 |
| commit | f5ac34b52229b977e26306de797c99b554d18cec (patch) | |
| tree | 26f90cd09f4dd1a774162fb166c229461afbd998 | |
| parent | aaed8bea601bf6deb1df418755976f97747ed98f (diff) | |
Release 13.4
| -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 99b8f008..dae06597 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.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.3 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.2 ${TARGET} ${TARGET} -COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.1 ${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 2f011486..e7bb22ee 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.4" - "13.3" - "13.2" - - "13.1" # Versions not appearing in the dropdown, but available as Docker images # https://docs.gitlab.com/archives/#offline-archives offline: + - "13.1" - "13.0" - "12.9" - "12.8" diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives index 5a5efab9..5ce5d0ce 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.4 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.3 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.2 ${TARGET} ${TARGET} COPY --from=registry.gitlab.com/gitlab-org/gitlab-docs:13.1 ${TARGET} ${TARGET} |