Merge branch 'master' of github.com:developer-portal/website

developer-portal · Sep 2, 2015 · 0507bd8 · 0507bd8
2 parents 64b8754 + 8062ed2
commit 0507bd8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,16 +11,18 @@ RUN dnf -y update && \
 
 RUN groupadd dp && useradd -g dp -u 1000 dp
 
-RUN mkdir /opt/developerportal && chown dp:dp /opt/developerportal
+RUN mkdir /opt/developerportal
 WORKDIR /opt/developerportal
 
+ADD . website/
+RUN chown -R dp:dp /opt/developerportal
+
 USER dp
 
 RUN gem install jekyll
 RUN gem install nokogiri -- --use-system-libraries
-RUN gem install jekyll-lunr-js-search
+RUN gem install jekyll-lunr-js-search jekyll-sitemap
 
-RUN git clone https://github.com/developer-portal/website
 
 WORKDIR /opt/developerportal/website
 

diff --git a/_includes/head.html b/_includes/head.html
@@ -9,11 +9,14 @@
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
 
+  <!-- Link to Sitemap -->
+  <link rel="sitemap" type="application/xml" title="Sitemap" href="/sitemap.xml" />
+
   <link href="/css/main.css" rel="stylesheet" media="screen, print">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
-  
+
 <!--  <link href="/static/css/patternfly.min.css" rel="stylesheet" media="screen, print"> -->
-  <script src="/static/components/jquery/dist/jquery.min.js"></script> 
+  <script src="/static/components/jquery/dist/jquery.min.js"></script>
   <script src="/static/components/bootstrap/dist/js/bootstrap.min.js"></script>
   <script src="/static/components/datatables/media/js/jquery.dataTables.js"></script>
   <script src="/static/js/patternfly.min.js"></script>

diff --git a/_plugins/jekyll_lunr_js_search.rb b/_plugins/jekyll_lunr_js_search.rb
@@ -1,3 +1,5 @@
+require_relative './permalinks.rb'
+
 require 'fileutils'
 require 'net/http'
 require 'json'
@@ -240,8 +242,8 @@ def write(dest)
     end
   end
 end
-module Jekyll
-  module LunrJsSearch
-    VERSION = "0.3.0"
-  end
-end
+#module Jekyll
+#  module LunrJsSearch
+#    VERSION = "0.3.0"
+#  end
+#end