commit f223a0d981a49ac686ed9ef687a4d42458b7af53
author Dave Borowitz <dborowitz@google.com> Mon Jul 09 20:45:46 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 09 20:45:46 2018 +0000
tree 04a5b544688b4411abc64117d1b3a32212877de3
parent 004dbc5e8609065c7744e4916493743bc4f86114
parent c0eb55dc65b037cc75461a89bd9789e25cc91812

Merge "Update new site to include remaining gerritcodereview.com pages." into md-pages

jekyll-source/_config.yml

diff --git a/jekyll-source/_config.yml b/jekyll-source/_config.yml
index 5f29e29..d235869 100644
--- a/jekyll-source/_config.yml
+++ b/jekyll-source/_config.yml
@@ -40,6 +40,16 @@
   - vendor/cache/
   - vendor/gems/
   - vendor/ruby/
+  - Dockerfile
+  - docker-compose.yml
+  - docker-entrypoint.sh
+  - createtag
+  - firebase-debug.log
+  - pdf-all.sh
+  - pdf-mydoc.sh
+  - pdf-product1.sh
+  - pdf-product2.sh
+  - update.sh
 # these are the files and directories that jekyll will exclude from the build
 
 feedback_subject_line: Gerrit Code Review Feedback

jekyll-source/docker-compose.yml

diff --git a/jekyll-source/docker-compose.yml b/jekyll-source/docker-compose.yml
index ba1e36e..4aeea8c 100644
--- a/jekyll-source/docker-compose.yml
+++ b/jekyll-source/docker-compose.yml
@@ -1,8 +1,8 @@
 version: '2'
 services:
   server:
-    image: bretfisher/jekyll-serve
+    build: .
     ports:
-            - "4000:4000"
+      - "4000:4000"
     volumes:
       - ".:/site"

jekyll-source/docker-entrypoint.sh

diff --git a/jekyll-source/docker-entrypoint.sh b/jekyll-source/docker-entrypoint.sh
old mode 100644
new mode 100755