Release 11.5

4 files changed, 17 insertions, 19 deletions

diff --git a/Dockerfile.master b/Dockerfile.master
index 7ac5e758..3ffe7e1c 100644
--- a/Dockerfile.master
+++ b/Dockerfile.master
@@ -23,12 +23,10 @@ COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:nginx-onbuild /etc/nginx/
 RUN rm -rf /usr/share/nginx/html/*
 
 # Get all the archive static HTML and put it into place
-# Go oldest-to-newest to take advantage of the fact that we change older
-# archives less often than new ones. Copy the versions found in
-# 'content/_data/versions.yaml' under current and previous.
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.2 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.3 ${TARGET} ${TARGET}
+# Copy the versions found in 'content/_data/versions.yaml' under online.
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.5 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.4 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.3 ${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
diff --git a/content/404.html b/content/404.html
index 9edb2519..f7d1ae92 100644
--- a/content/404.html
+++ b/content/404.html
@@ -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/.test(window.location.href)) {
+  if (/10.3|10.4|10.5|10.6|10.7|10.8|11.0|11.1|11.2/.test(window.location.href)) {
     window.location.replace("https://docs.gitlab.com/archives");
   }
 </script>
diff --git a/content/_data/versions.yaml b/content/_data/versions.yaml
index 1906a822..1dc5bd35 100644
--- a/content/_data/versions.yaml
+++ b/content/_data/versions.yaml
@@ -1,11 +1,12 @@
 # The first online version should always point to the
 # current stable version.
 online:
+  - "11.5"
   - "11.4"
   - "11.3"
-  - "11.2"
 
 offline:
+  - "11.2"
   - "11.1"
   - "11.0"
   - "10.8"
diff --git a/dockerfiles/Dockerfile.archives b/dockerfiles/Dockerfile.archives
index b85459f4..f9002c4b 100644
--- a/dockerfiles/Dockerfile.archives
+++ b/dockerfiles/Dockerfile.archives
@@ -7,19 +7,18 @@ ENV TARGET=/usr/share/nginx/html
 COPY --from=registry.gitlab.com/gitlab-com/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
-# Go oldest-to-newest to take advantage of the fact that we change older
-# archives less often than new ones.
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.3 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.4 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.5 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.6 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.7 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.8 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.0 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.1 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.2 ${TARGET} ${TARGET}
-COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.3 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.5 ${TARGET} ${TARGET}
 COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.4 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.3 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.2 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.1 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:11.0 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.8 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.7 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.6 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.5 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.4 ${TARGET} ${TARGET}
+COPY --from=registry.gitlab.com/gitlab-com/gitlab-docs:10.3 ${TARGET} ${TARGET}
 
 # Serve the site (target), which is now all static HTML
 CMD echo -e "GitLab docs are viewable at:\nhttp://0.0.0.0:4000"; exec nginx -g 'daemon off;'