Fix script

Author: wgordon17

.s2i/bin/assemble

@@ -18,7 +18,7 @@ bundle install --path ./bundle --binstubs
 export LANG="en_US.UTF-8"
 
 echo "---> Building webpage from source ..."
-build_docs
+exec $HOME/build_docs
 
 # Fix source directory permissions
 echo "---> Fixing permissions ..."

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

@@ -120,14 +120,11 @@ AddType text/vtt                            vtt
     Order Allow,Deny
     Allow from All
 
-    DirectoryIndex welcome.html
-
     RewriteEngine On
     RewriteBase /
 
     # Rules have NE added to the end in order to preserve either explicit or implicit # anchor tags
-    # Not working for some reason
-    # RewriteRule ^/$ /welcome.html [R=301]
+    RewriteRule ^$ /welcome.html [R=301,NE]
 
   </Directory>
 </IfModule>

Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'asciidoctor', '~>1.5.6.2'
+gem 'asciidoctor'

deployment-template.yml

@@ -137,10 +137,8 @@ objects:
               kind: "ImageStreamTag"
               name: "stg1-${NAME}:latest"
             paths:
-              - sourcePath: "/opt/app-root/src/welcome.html"
+              - sourcePath: "/opt/app-root/src/dist/."
                 destinationDir: "."
-              - sourcePath: "/opt/app-root/src/images/."
-                destinationDir: "images/."
               - sourcePath: "/opt/app-root/src/.s2i/httpd-cfg/."
                 destinationDir: "httpd-cfg/."
       strategy: