Merge branch 'master' of git.data.coop:ulovliglogning/ulovliglogning.dk

Gemfile

@@ -18,6 +18,7 @@ gem "jekyll", "~> 3.6.2"
 # If you have any plugins, put them here!
 group :jekyll_plugins do
   gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-livereload"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -16,8 +16,12 @@ GEM
     commonmarker (0.17.7.1)
       ruby-enum (~> 0.5)
     concurrent-ruby (1.0.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
     ethon (0.11.0)
       ffi (>= 1.3.0)
+    eventmachine (1.2.5)
     execjs (2.7.0)
     faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
@@ -77,6 +81,7 @@ GEM
     html-pipeline (2.7.1)
       activesupport (>= 2)
       nokogiri (>= 1.4)
+    http_parser.rb (0.6.0)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     jekyll (3.6.2)
@@ -111,6 +116,9 @@ GEM
     jekyll-github-metadata (2.9.3)
       jekyll (~> 3.1)
       octokit (~> 4.0, != 4.4.0)
+    jekyll-livereload (0.2.2)
+      em-websocket (~> 0.5)
+      jekyll (~> 3.0)
     jekyll-mentions (1.2.0)
       activesupport (~> 4.0)
       html-pipeline (~> 2.3)
@@ -235,7 +243,8 @@ DEPENDENCIES
   github-pages
   jekyll (~> 3.6.2)
   jekyll-feed (~> 0.6)
+  jekyll-livereload
   tzinfo-data
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

README.md

@@ -1,14 +1,20 @@
 # Jekyll site for ulovliglogning.dk
 
-## Install
+## To work on the code, either
 
-### Install Jekyll and Bundler gems through RubyGems
+### Use docker
+You need docker-compose. Simply run
+`docker-compose up` to launch the site in a docker container with livereload support. 
+
+### Or install Jekyll locally
+
+#### Install Jekyll and Bundler gems through RubyGems
 `gem install jekyll bundler`
 
-### Install dependencies
+#### Install dependencies
 `bundle install`
 
-### Build the site local
+#### Build the site local
 `bundle exec jekyll serve`
 
 You can now see the site at [localhost:4000](http://localhost:4000)

docker-compose.yml

@@ -0,0 +1,9 @@
+
+jekyll:
+    image: jekyll/jekyll
+    command: jekyll serve --livereload --reload_port 35729
+    ports:
+        - 4000:4000
+        - 35729:35729
+    volumes:
+        - .:/srv/jekyll