From 0041e7c29a84636837c3c1f980ca7961db954329 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Fri, 10 Jun 2016 15:35:34 +0200
Subject: [PATCH 01/26] Update ubuntu and ruby and thus jekyll version

---
 dockerjekyllpages/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockerjekyllpages/Dockerfile b/dockerjekyllpages/Dockerfile
index 69d4e7a..153a8dc 100644
--- a/dockerjekyllpages/Dockerfile
+++ b/dockerjekyllpages/Dockerfile
@@ -1,10 +1,10 @@
-FROM ubuntu:trusty
+FROM ubuntu:xenial
 MAINTAINER dmcnamara
 
 # Install
 RUN apt-get update && apt-get install -y \
      git \
-     ruby1.9.1-full \
+     ruby-full \
      build-essential \
      nginx \
      uwsgi \

From 60e75c91429fef6ad9a580bbb6a45792cf4dc6cf Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Fri, 10 Jun 2016 15:40:17 +0200
Subject: [PATCH 02/26] move files to top level

---
 dockerjekyllpages/Dockerfile => Dockerfile                   | 0
 dockerjekyllpages/README.md => README.md                     | 0
 dockerjekyllpages/buildsite.sh => buildsite.sh               | 0
 dockerjekyllpages/nginx.conf => nginx.conf                   | 0
 dockerjekyllpages/supervisor-app.conf => supervisor-app.conf | 0
 dockerjekyllpages/uwsgi.ini => uwsgi.ini                     | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename dockerjekyllpages/Dockerfile => Dockerfile (100%)
 rename dockerjekyllpages/README.md => README.md (100%)
 rename dockerjekyllpages/buildsite.sh => buildsite.sh (100%)
 rename dockerjekyllpages/nginx.conf => nginx.conf (100%)
 rename dockerjekyllpages/supervisor-app.conf => supervisor-app.conf (100%)
 rename dockerjekyllpages/uwsgi.ini => uwsgi.ini (100%)

diff --git a/dockerjekyllpages/Dockerfile b/Dockerfile
similarity index 100%
rename from dockerjekyllpages/Dockerfile
rename to Dockerfile
diff --git a/dockerjekyllpages/README.md b/README.md
similarity index 100%
rename from dockerjekyllpages/README.md
rename to README.md
diff --git a/dockerjekyllpages/buildsite.sh b/buildsite.sh
similarity index 100%
rename from dockerjekyllpages/buildsite.sh
rename to buildsite.sh
diff --git a/dockerjekyllpages/nginx.conf b/nginx.conf
similarity index 100%
rename from dockerjekyllpages/nginx.conf
rename to nginx.conf
diff --git a/dockerjekyllpages/supervisor-app.conf b/supervisor-app.conf
similarity index 100%
rename from dockerjekyllpages/supervisor-app.conf
rename to supervisor-app.conf
diff --git a/dockerjekyllpages/uwsgi.ini b/uwsgi.ini
similarity index 100%
rename from dockerjekyllpages/uwsgi.ini
rename to uwsgi.ini

From 496d3c5427094a8623daa3a0cef6c1b4ecc91bf7 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Fri, 10 Jun 2016 15:44:23 +0200
Subject: [PATCH 03/26] Add reference to origin and to docker hub location

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 33558b4..c684c43 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+This is a fork from https://github.com/DonMcNamara/dockerfiles/tree/master/dockerjekyllpages which is built at https://hub.docker.com/r/dmcnamara/dockerjekyllpages/
+
+This repo is built at https://hub.docker.com/r/whitegecko/dockerjekyllpages/
+
 ### Description
 This is a docker image to run Jekyll against a git repository. This is essentially githubpages in a docker image. This docker image uses nginx, Jekyll, uwsgi and supervisor.
 

From 6f82f350477fbeb7828018e9f41ab2d351ef2d64 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 8 Jun 2017 13:41:03 +0200
Subject: [PATCH 04/26] Set index

---
 nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx.conf b/nginx.conf
index 02fb64a..b6addca 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,6 +1,7 @@
 server {
 	location / {
 		root /data/jekyll/_site;
+		index index.html
 	}
 
 	location /cgi {

From 9dc5d63e24ad88b267e4b4057a4309600f3a36d3 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 8 Jun 2017 13:58:51 +0200
Subject: [PATCH 05/26] Update nginx config for try order

---
 nginx.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nginx.conf b/nginx.conf
index b6addca..a7b38ca 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,7 +1,10 @@
 server {
+
+	root /data/jekyll/_site;
+	index index.html
+
 	location / {
-		root /data/jekyll/_site;
-		index index.html
+		try_files $uri $uri/ /index.html;
 	}
 
 	location /cgi {

From 91c7d1bda21c361248d9bb1f3bec2ba1904429b2 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 8 Jun 2017 14:12:28 +0200
Subject: [PATCH 06/26] Fix nginx config

---
 nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index a7b38ca..49a7dec 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,7 +1,7 @@
 server {
 
 	root /data/jekyll/_site;
-	index index.html
+	index index.html;
 
 	location / {
 		try_files $uri $uri/ /index.html;

From 26ac14afbf1def40bbe9f6f64a1be3580b1c42f3 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 8 Jun 2017 15:38:40 +0200
Subject: [PATCH 07/26] Fix try order for nginx

---
 nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index 49a7dec..9fc332c 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -4,7 +4,7 @@ server {
 	index index.html;
 
 	location / {
-		try_files $uri $uri/ /index.html;
+		try_files $uri $uri/ $uri.html /index.html;
 	}
 
 	location /cgi {

From 4d1260f571e4cda7beb2031c499a21318423392c Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Wed, 14 Jun 2017 18:01:09 +0200
Subject: [PATCH 08/26] Add support for arbitrary plugins using bundler

---
 Dockerfile   |  6 ++++--
 buildsite.sh | 24 ++++++++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 153a8dc..23ee5dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:xenial
 MAINTAINER dmcnamara
 
 # Install
+## zlib1g-dev is needed for nokogiri dependency of jekyll-rdf
 RUN apt-get update && apt-get install -y \
      git \
      ruby-full \
@@ -10,9 +11,10 @@ RUN apt-get update && apt-get install -y \
      uwsgi \
      uwsgi-core \
      supervisor \
-     nodejs
+     nodejs \
+     zlib1g-dev
 
-RUN gem install --no-rdoc --no-ri jekyll
+RUN gem install --no-rdoc --no-ri jekyll bundler
 
 # Configure nginx.
 RUN echo "\ndaemon off;" >> /etc/nginx/nginx.conf
diff --git a/buildsite.sh b/buildsite.sh
index e34b48e..5d01203 100644
--- a/buildsite.sh
+++ b/buildsite.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+SOURCE="/data/jekyll/source"
+TARGET="/data/jekyll/_site"
+
 # Output an HTML header so this works as a CGI script.
 echo "Content-type: text/html"
 echo ""
@@ -7,13 +10,26 @@ echo ""
 echo "<HTML><BODY><PRE>"
 
 # delete the old directory. (This is a bit heavy handed.)
-rm --recursive /data/jekyll/source
+rm --recursive $SOURCE
 
 # pull down the repo
-git clone $REPO /data/jekyll/source
+git clone $REPO $SOURCE
+
+if [ -s $SOURCE/Gemfile ]
+then
+    cd $SOURCE
+
+    echo "Install dependencies from Gemfile"
+    # update gems
+    bundle install
 
-# generate the site with jekyll
-jekyll build -s /data/jekyll/source -d /data/jekyll/_site
+    # generate the site with jekyll
+    bundle exec jekyll build -s $SOURCE -d $TARGET
+else
+    echo "No Gemfile found use standard jekyll installation"
+    # generate the site with jekyll
+    jekyll build -s $SOURCE -d $TARGET
+fi
 
 echo
 date

From 67edca3a231f43210e9dcf811d24778450a33ff6 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Mon, 19 Jun 2017 17:48:42 +0200
Subject: [PATCH 09/26] Configure usage of an error 404 page

---
 nginx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index 9fc332c..6c082ae 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -4,7 +4,8 @@ server {
 	index index.html;
 
 	location / {
-		try_files $uri $uri/ $uri.html /index.html;
+		try_files $uri $uri.html $uri/ =404;
+		error_page 404 /404.html;
 	}
 
 	location /cgi {

From e548d912329c32685f983a4712efa0a368afd451 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Wed, 21 Jun 2017 16:52:24 +0200
Subject: [PATCH 10/26] Improve build process to handle volumes and branches

* Build process: specify branch to checkout
* Build process: build from volume
* Update README

Fix #2. Fix #3.
---
 Dockerfile   |  6 +++++-
 README.md    | 33 +++++++++++++++++++++++++--------
 buildsite.sh | 25 ++++++++++++++++++++-----
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 23ee5dc..ce8551d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM ubuntu:xenial
-MAINTAINER dmcnamara
+MAINTAINER Natanael Arndt <arndtn@gmail.com>
+
+ENV LANG C.UTF-8
 
 # Install
 ## zlib1g-dev is needed for nokogiri dependency of jekyll-rdf
@@ -28,5 +30,7 @@ ADD ./supervisor-app.conf /etc/supervisor/conf.d/
 ADD ./buildsite.sh /data/cgi/buildsite.sh
 RUN chmod +x /data/cgi/buildsite.sh
 
+VOLUME /data/jekyll/source
+
 EXPOSE 80
 CMD ["supervisord", "-n"]
diff --git a/README.md b/README.md
index c684c43..cadc986 100644
--- a/README.md
+++ b/README.md
@@ -3,26 +3,43 @@ This is a fork from https://github.com/DonMcNamara/dockerfiles/tree/master/docke
 This repo is built at https://hub.docker.com/r/whitegecko/dockerjekyllpages/
 
 ### Description
-This is a docker image to run Jekyll against a git repository. This is essentially githubpages in a docker image. This docker image uses nginx, Jekyll, uwsgi and supervisor.
+This is a docker image to build a Jekyll page from a Git repository.
+This is essentially githubpages in a docker image.
+This docker image uses nginx, Jekyll, uwsgi and supervisor.
 
 ### Configuration of docker image
-The git repository URL is passed as an environment variable to the docker image. The environment variable is named REPO.
+The git repository URL is passed as an environment variable to the docker image.
+The environment variable is named `REPO`, also a branch to build can be specified using the variable `BRANCH`.
+Alternatively the container can be linked to a volume at `/data/jekyll/source` which contains the Jekyll page to build.
 
 ### Triggering builds
 To initiate a rebuild, you can use your browser to load http://yourserver/cgi/buildsite.sh
 
-For an automatic build, you can set up a git service hook that posts to that URL on a git push. Your site will rebuild when you push changes to your repository.
-
+For an automatic build, you can set up a git service hook that posts to that URL on a git push.
+Your site will rebuild when you push changes to your repository.
 
 ### Execution
-This will host your Jekyll built site on local port 8080.
+Per default the site will be hosted on port 80.
+This is especially useful in combination with a proxy container e.g. the one from [jwilder](https://hub.docker.com/r/jwilder/nginx-proxy/).
+
+If you want to serve you site locally you can map it e.g. to port 8080:
 ```
-sudo docker run -p :8080:80 -e REPO=[YOUR REPO URL HERE] dmcnamara/dockerjekyllpages
+sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH] white-gecko/dockerjekyllpages
 ```
 
-The repository URL is the URL to the .git file. For example, on github, it would be something like https://github.com/username/myrepo.git
-
 ### Release Notes
 
+#### 0.2 Some Improvements
+* Some improvements by white-gecko
+* Update baseimage, ruby and thus jekyll
+* Reorganize file structure
+* NGINX: also serve pages without .html
+* NGINX: deliver 404 status codes
+* NGINX: serve custom 404 pages
+* Build process: install dependencies from Gemfile
+* Build process: specify branch to checkout
+* Build process: build from volume
+* Update README
+
 #### 0.1 Initial release.
 * It seems to work.
diff --git a/buildsite.sh b/buildsite.sh
index 5d01203..a661944 100644
--- a/buildsite.sh
+++ b/buildsite.sh
@@ -9,11 +9,26 @@ echo ""
 
 echo "<HTML><BODY><PRE>"
 
-# delete the old directory. (This is a bit heavy handed.)
-rm --recursive $SOURCE
-
-# pull down the repo
-git clone $REPO $SOURCE
+if [ -z "$(ls -A $SOURCE)" ]
+then
+    # $SOURCE is empty
+    if [ -z "$REPO" ]
+    then
+        echo "The source directory is empty and no repository is specified. I don't know what to build. :-("
+        exit 1
+    else
+        # pull down the repo
+        if [ -z "$BRANCH" ]
+        then
+            git clone $REPO $SOURCE
+        else
+            git clone --branch "$BRANCH" $REPO $SOURCE
+        fi
+    fi
+else
+    cd $SOURCE
+    git pull || true
+fi
 
 if [ -s $SOURCE/Gemfile ]
 then

From 07387ca9162070a56e172649c6c4dc07a1a40c7c Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Wed, 21 Jun 2017 16:57:18 +0200
Subject: [PATCH 11/26] Fix changelog in README

---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cadc986..2e47fef 100644
--- a/README.md
+++ b/README.md
@@ -29,9 +29,8 @@ sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH]
 
 ### Release Notes
 
-#### 0.2 Some Improvements
-* Some improvements by white-gecko
-* Update baseimage, ruby and thus jekyll
+#### 0.2.0 Some Improvements
+* Update base image, ruby and thus jekyll
 * Reorganize file structure
 * NGINX: also serve pages without .html
 * NGINX: deliver 404 status codes
@@ -41,5 +40,5 @@ sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH]
 * Build process: build from volume
 * Update README
 
-#### 0.1 Initial release.
+#### 0.1.0 Initial release.
 * It seems to work.

From c4ede0467e2b9fcd05c6554f4c089175806b5391 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Fri, 23 Jun 2017 13:53:05 +0200
Subject: [PATCH 12/26] Add support for including an SSH key

* Set SSH_AUTH_SOCK environment variable per default
* README: Explain how to forward the respective SSH resources to the container

Fix #1.
---
 Dockerfile |  1 +
 README.md  | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ce8551d..2948c43 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@ FROM ubuntu:xenial
 MAINTAINER Natanael Arndt <arndtn@gmail.com>
 
 ENV LANG C.UTF-8
+ENV SSH_AUTH_SOCK /var/run/ssh-agent.sock
 
 # Install
 ## zlib1g-dev is needed for nokogiri dependency of jekyll-rdf
diff --git a/README.md b/README.md
index 2e47fef..8bf0d76 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,15 @@ The git repository URL is passed as an environment variable to the docker image.
 The environment variable is named `REPO`, also a branch to build can be specified using the variable `BRANCH`.
 Alternatively the container can be linked to a volume at `/data/jekyll/source` which contains the Jekyll page to build.
 
+#### Use SSH Authentication
+If you want to clone private git repositories your might want to forward your private SSH key resp. the *SSH Authentication Socket*.
+Per default the `SSH_AUTH_SOCK` environment variable is set to `/var/run/ssh-agent.sock` in this image thus you only have to mount the hosts `SSH_AUTH_SOCK` to the container by adding the argument `-v "$SSH_AUTH_SOCK:/var/run/ssh-agent.sock"`.
+If you don't have an `SSH_AUTH_SOCK` running on the docker host you can also mount the `id_rsa`-file e.g. with `-v $HOME/.ssh/id_rsa:/root/.ssh/id_rsa:ro`.
+In the case that you are mounting a private key rather then using the hosts SSH agent it is a good idea to generate a key without password.
+
+Usually you also want to tell the known hosts to the container so it doesn't prompt for the decision.
+You can do this by mounting the hosts `known_hosts`-file with `-v $HOME/.ssh/known_hosts:/root/.ssh/known_hosts:ro`.
+
 ### Triggering builds
 To initiate a rebuild, you can use your browser to load http://yourserver/cgi/buildsite.sh
 
@@ -27,7 +36,11 @@ If you want to serve you site locally you can map it e.g. to port 8080:
 sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH] white-gecko/dockerjekyllpages
 ```
 
-### Release Notes
+### Changelog
+
+#### 0.3.0 Add Support for private SSH repositories
+* Set SSH_AUTH_SOCK environment variable per default
+* README: Explain how to forward the respective SSH resources to the container
 
 #### 0.2.0 Some Improvements
 * Update base image, ruby and thus jekyll

From 52f069394d97ad3643ad2a2f9c2c0a61e149ad01 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 27 Jun 2017 12:47:12 +0200
Subject: [PATCH 13/26] Remove apt list cache after installation

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2948c43..3e0fd55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,8 @@ RUN apt-get update && apt-get install -y \
      uwsgi-core \
      supervisor \
      nodejs \
-     zlib1g-dev
+     zlib1g-dev \
+     && rm -rf /var/lib/apt/lists/*
 
 RUN gem install --no-rdoc --no-ri jekyll bundler
 

From e29bda3515390abb1292e8a2c9e5b342d07a4083 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 27 Jun 2017 12:51:13 +0200
Subject: [PATCH 14/26] Update README with 0.3.1 changes

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 8bf0d76..f38e667 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@ sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH]
 
 ### Changelog
 
+#### 0.3.1
+* Remove apt list cache after installation with apt-get (should save some space)
+
 #### 0.3.0 Add Support for private SSH repositories
 * Set SSH_AUTH_SOCK environment variable per default
 * README: Explain how to forward the respective SSH resources to the container

From 090f82eda3c71c7448720e430c65053bae6be71c Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 11 Jul 2017 14:34:12 +0200
Subject: [PATCH 15/26] Remove deb pacakges which are not needed to save space

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3e0fd55..2a04f8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,15 +6,15 @@ ENV SSH_AUTH_SOCK /var/run/ssh-agent.sock
 
 # Install
 ## zlib1g-dev is needed for nokogiri dependency of jekyll-rdf
+## ruby-dev and build-essential are needed to build jekyll
 RUN apt-get update && apt-get install -y \
      git \
-     ruby-full \
+     ruby \
+     ruby-dev \
      build-essential \
      nginx \
      uwsgi \
-     uwsgi-core \
      supervisor \
-     nodejs \
      zlib1g-dev \
      && rm -rf /var/lib/apt/lists/*
 

From ad653bdbfbd3297264a32fbd27c1323421a1fbd9 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 11 Jul 2017 14:52:13 +0200
Subject: [PATCH 16/26] Update base image

* Update base image to ubuntu:zesty, latest and saves space
* Update Changelog
---
 Dockerfile | 2 +-
 README.md  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2a04f8b..65b4156 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:zesty
 MAINTAINER Natanael Arndt <arndtn@gmail.com>
 
 ENV LANG C.UTF-8
diff --git a/README.md b/README.md
index f38e667..0d5dc29 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,10 @@ sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH]
 
 ### Changelog
 
+#### 0.3.2
+* Remove debian packages which are not used
+* Update base image to ubuntu:zesty, latest and saves space
+
 #### 0.3.1
 * Remove apt list cache after installation with apt-get (should save some space)
 

From 460093961f52e6651d58eef4ba6c9a6ac466fe21 Mon Sep 17 00:00:00 2001
From: Gezim Sejdiu <g.sejdiu@gmail.com>
Date: Wed, 20 Sep 2017 14:51:24 +0200
Subject: [PATCH 17/26] Update README --> Correct name of docker image from
 docker.hub

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0d5dc29..693a717 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ This is especially useful in combination with a proxy container e.g. the one fro
 
 If you want to serve you site locally you can map it e.g. to port 8080:
 ```
-sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH] white-gecko/dockerjekyllpages
+sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH] whitegecko/dockerjekyllpages
 ```
 
 ### Changelog

From d6c1476daa605d0accccad332789d2bc4c0f7668 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 22 Mar 2018 16:24:40 +0100
Subject: [PATCH 18/26] Add troubleshooting section

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 693a717..737f61e 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,23 @@ If you want to serve you site locally you can map it e.g. to port 8080:
 sudo docker run -p 8080:80 -e REPO=[YOUR REPO URL HERE] -e BRANCH=[YOUR BRANCH] whitegecko/dockerjekyllpages
 ```
 
+### Troubleshooting
+
+#### Authenticity can't be established
+
+If you experience that `./buildsite.sh` never ends and if you run it manually you get the following output:
+
+    The authenticity of host 'github.com (192.30.253.113)' can't be established.
+    RSA key fingerprint is SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8.
+    Are you sure you want to continue connecting (yes/no)?
+
+You are using a ssh remote URL.
+
+There are two solutions:
+
+1. Use a HTTPS URL for the remote instead
+2. Include a `known_hosts`-file as explained above in the "Use SSH Authentication"-section
+
 ### Changelog
 
 #### 0.3.2

From 45b890732d2adf602987dc3d5d0552dde3fbeb80 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 13 Nov 2018 17:50:03 +0100
Subject: [PATCH 19/26] Add some hack to match turtle

---
 nginx.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nginx.conf b/nginx.conf
index 6c082ae..90fec6b 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -4,9 +4,17 @@ server {
 	index index.html;
 
 	location / {
+		if ($http_accept ~ "text\/turtle") {
+			rewrite ^(.*)$ /ttl$1 last;
+		}
 		try_files $uri $uri.html $uri/ =404;
 		error_page 404 /404.html;
 	}
+	
+	location /ttl {
+		index index.ttl;
+		try_files $uri $uri.ttl $uri/ =404;
+	}
 
 	location /cgi {
 		include uwsgi_params;

From 7e986ec6e0ce3f09a6ec38078b826be31aae7104 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 13 Nov 2018 17:58:16 +0100
Subject: [PATCH 20/26] Update to cosmic

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 65b4156..d1971a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:zesty
+FROM ubuntu:cosmic
 MAINTAINER Natanael Arndt <arndtn@gmail.com>
 
 ENV LANG C.UTF-8

From d5a1ad689884a2c68317f453b9e3a23b4e85acce Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Sun, 18 Nov 2018 21:03:25 +0100
Subject: [PATCH 21/26] Set default datatype for ttl location to text/turtle

---
 nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx.conf b/nginx.conf
index 90fec6b..22cd1b2 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -12,6 +12,7 @@ server {
 	}
 	
 	location /ttl {
+		default_type text/turtle;
 		index index.ttl;
 		try_files $uri $uri.ttl $uri/ =404;
 	}

From 528bff796396c6057aebd27bc5eb8b7585eba04a Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Sun, 18 Nov 2018 22:30:55 +0100
Subject: [PATCH 22/26] Add CORS header to ttl location

---
 nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx.conf b/nginx.conf
index 22cd1b2..919bd98 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -13,6 +13,7 @@ server {
 	
 	location /ttl {
 		default_type text/turtle;
+		add_header Access-Control-Allow-Origin *;
 		index index.ttl;
 		try_files $uri $uri.ttl $uri/ =404;
 	}

From dc5b902f12d3ee119cd41a3b12774255150ad0df Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Wed, 28 Nov 2018 16:34:32 +0100
Subject: [PATCH 23/26] Add origin as CORS header

---
 nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index 919bd98..a52f41a 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -13,7 +13,7 @@ server {
 	
 	location /ttl {
 		default_type text/turtle;
-		add_header Access-Control-Allow-Origin *;
+		add_header Access-Control-Allow-Origin $http_origin;
 		index index.ttl;
 		try_files $uri $uri.ttl $uri/ =404;
 	}

From ce52dc7b66e0774f4944ec4111a6e7c7e4dffe6a Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Wed, 28 Nov 2018 17:07:10 +0100
Subject: [PATCH 24/26] Add Access-Control-Allow-Credentials

---
 nginx.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nginx.conf b/nginx.conf
index a52f41a..8af0447 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -14,6 +14,7 @@ server {
 	location /ttl {
 		default_type text/turtle;
 		add_header Access-Control-Allow-Origin $http_origin;
+		add_header Access-Control-Allow-Credentials true;
 		index index.ttl;
 		try_files $uri $uri.ttl $uri/ =404;
 	}

From 9ccd28286a7d25079d9df25bec8997dca8b998a9 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Sat, 8 Dec 2018 12:55:48 +0100
Subject: [PATCH 25/26] Add n3 and old turtle mimetypes

---
 nginx.conf | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index 8af0447..59f877d 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -7,10 +7,16 @@ server {
 		if ($http_accept ~ "text\/turtle") {
 			rewrite ^(.*)$ /ttl$1 last;
 		}
+		if ($http_accept ~ "application\/x-turtle") {
+			rewrite ^(.*)$ /ttl$1 last;
+		}
+		if ($http_accept ~ "text\/n3") {
+			rewrite ^(.*)$ /ttl$1 last;
+		}
 		try_files $uri $uri.html $uri/ =404;
 		error_page 404 /404.html;
 	}
-	
+
 	location /ttl {
 		default_type text/turtle;
 		add_header Access-Control-Allow-Origin $http_origin;

From 9721af7b909794682a8bfe9a0cefd8f8db27c384 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Wed, 8 Jun 2022 14:41:06 +0200
Subject: [PATCH 26/26] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 737f61e..6e33810 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+Maybe this is not state of the art anymore.
+Better build your page with some CI/CD system and then serve it as static site with: https://github.com/white-gecko/mini-server.compose
+
+
 This is a fork from https://github.com/DonMcNamara/dockerfiles/tree/master/dockerjekyllpages which is built at https://hub.docker.com/r/dmcnamara/dockerjekyllpages/
 
 This repo is built at https://hub.docker.com/r/whitegecko/dockerjekyllpages/