Install version locked ffi gem

- Also fixes commercial index page pointing to wrong location for Online docs

Author: wgordon17

.s2i/bin/assemble

@@ -2,6 +2,9 @@
 # The assemble script builds the application artifacts from source and
 # places them into appropriate directories inside the image.
 
+# Required to install `ffi` separately due to an installation issue with ffi v-1.9.21
+echo "---> Installing ffi ..."
+gem install ffi --version 1.9.18
 # `gem install` is required because `bundle install` does not properly place `asciibinder` into $PATH
 echo "---> Installing AsciiBinder ..."
 gem install ascii_binder
@@ -26,8 +29,9 @@ export LANG="en_US.UTF-8"
 echo "---> AsciiBinder packaging commercial content ..."
 # AsciiBinder uses git to some extent and requires `user.email` to be properly set
 git config user.email "[email protected]"
-# Properly package assets
+# Package assets for commercial site only, without Minishift content
 asciibinder package --site=commercial
+# Move commercial content to its own directory, including commercial specific redirects and 404 page
 mkdir commercial_package
 mv _package/commercial commercial_package
 git checkout master
@@ -52,7 +56,9 @@ else
 fi
 
 echo "---> AsciiBinder packaging community content ..."
+# Package assets for community site only, with Minishift content
 asciibinder package --site=community
+# Move community content to its own directory, including community specific redirects and 404 page
 mkdir community_package
 mv _package/community community_package
 git checkout master

asciibinder-template.yml

@@ -58,6 +58,8 @@ objects:
         kind: "Service"
         name: "commercial-${NAME}"
         weight: 1
+      port:
+        targetPort: "https"
       tls:
         termination: "edge"
         insecureEdgeTerminationPolicy: "Redirect"
@@ -74,6 +76,8 @@ objects:
         kind: "Service"
         name: "community-${NAME}"
         weight: 1
+      port:
+        targetPort: "https"
       tls:
         termination: "edge"
         insecureEdgeTerminationPolicy: "Redirect"

contributing_to_docs/tools_and_setup.adoc

@@ -154,11 +154,10 @@ workstation to edit existing topics or create new topics.
 === How to deploy to OpenShift
 You can deploy to OpenShift for development by running
 
-[source, bash]
 ---
 oc process -f asciibinder-template.yml -p NAME=docs \
-    -p SOURCE_REPOSITORY_URL=(git remote get-url origin) \
-    -p SOURCE_REPOSITORY_REF=(git rev-parse --abbrev-ref HEAD) \
+    -p SOURCE_REPOSITORY_URL=$(git remote get-url origin) \
+    -p SOURCE_REPOSITORY_REF=$(git rev-parse --abbrev-ref HEAD) \
     -p MEMORY_LIMIT=512Mi -p MEMORY_REQUEST=256Mi \
     | oc create -f -
 ---
@@ -175,7 +174,6 @@ and add it to the stg1 build, `oc set build-secret --source bc/stg1-docs <secret
 
 You can delete all created objects by running
 
-[source, bash]
 ---
 oc delete all -l app=docs
 ---

index-commercial.html

@@ -403,7 +403,7 @@ <h1>OpenShift Documentation</h1>
             <h2>OpenShift Online</h2>
             <div class="list-group">
               <p class="list-group-item-text">Red Hat's public cloud application deployment and hosting platform.</p>
-              <p><a role="button" class="btn btn-primary" href="dedicated/"><i class="fa fa-arrow-circle-o-right"></i> Online</a></p>
+              <p><a role="button" class="btn btn-primary" href="online/"><i class="fa fa-arrow-circle-o-right"></i> Online</a></p>
             </div>
           </div>
           <div class="col-sm-3 text-center">