Merge pull request #20642 from vikram-redhat/minishift

Minishift docs to 3.11

Author: vikram-redhat

.s2i/bin/assemble

@@ -43,7 +43,9 @@ mkdir commercial_package/commercial/httpd-cfg
 mv .s2i/httpd-cfg/01-commercial.conf commercial_package/commercial/httpd-cfg
 mv 404-commercial.html commercial_package/commercial/404.html
 
-git checkout master
+# minishift docs only need to be on 3.x
+
+git checkout enterprise-3.11
 echo "---> Installing Minishift content ..."
 mkdir minishift
 cd minishift
@@ -52,7 +54,7 @@ if wget http://minishift.io/minishift-adoc.tar ; then
     cat _topic_map.yml >> ../_topic_map.yml
     rm minishift-adoc.tar
     cd ..
-    git add .
+    git add minishift/
     git commit -am "Minishift build-time commit"
 else
     echo "WARNING: Could not retrieve minishift-adoc.tar"

.s2i/httpd-cfg/01-commercial.conf

@@ -129,7 +129,7 @@ AddType text/vtt                            vtt
     RewriteRule ^(container-platform)/4.0/?(.*)$ /container-platform/4\.1/$2 [NE,R=301]
 
     # set OKD docs minishift to go to the 3.11 branch as minishift is not on 4.x (yet)
-    # RewriteRule ^latest/minishift/?(.*)$ /3.11/minishift/$1 [NE,R=301]
+    RewriteRule ^latest/minishift/?(.*)$ /3.11/minishift/$1 [NE,R=301]
 
     # Redirects for "latest" version
     RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]