From 7f72dda5b79bb60bd5397a0bf132602718a12a08 Mon Sep 17 00:00:00 2001 From: Jorge Arias Date: Mon, 12 Mar 2018 01:45:20 -0300 Subject: [PATCH 1/4] Fixed blank baseurl param problem with multiple configuration files --- _config.dev.yml | 1 + docker-compose.yml | 11 +++++++++++ scripts/serve | 2 +- scripts/serve-lan | 2 +- scripts/serve-lan-production | 2 +- scripts/serve-production | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 _config.dev.yml create mode 100644 docker-compose.yml mode change 100644 => 100755 scripts/serve-lan mode change 100644 => 100755 scripts/serve-lan-production diff --git a/_config.dev.yml b/_config.dev.yml new file mode 100644 index 0000000..2b9cde5 --- /dev/null +++ b/_config.dev.yml @@ -0,0 +1 @@ +baseurl: "" diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2034e74 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +version: "3" + +services: + jekyll: + image: jekyll/jekyll + ports: + - "4000:4000" + command: /bin/bash -c 'PATH=$$PATH:/srv/jekyll/scripts; serve-lan' + volumes: + - .:/srv/jekyll + diff --git a/scripts/serve b/scripts/serve index ee51d3c..474e8a4 100755 --- a/scripts/serve +++ b/scripts/serve @@ -1,3 +1,3 @@ #!/bin/bash -jekyll serve --watch --host "127.0.0.1" --baseurl "" +jekyll serve --watch --host "127.0.0.1" --config _config.yml,_config.dev.yml diff --git a/scripts/serve-lan b/scripts/serve-lan old mode 100644 new mode 100755 index 1e872ac..75964c9 --- a/scripts/serve-lan +++ b/scripts/serve-lan @@ -1,4 +1,4 @@ #!/bin/bash sudo iptables -I INPUT -p tcp --dport 4000 -j ACCEPT -jekyll serve --watch --host "0.0.0.0" --baseurl "" +jekyll serve --watch --host "0.0.0.0" --config _config.yml,_config.dev.yml diff --git a/scripts/serve-lan-production b/scripts/serve-lan-production old mode 100644 new mode 100755 index ccbc119..66ae6cf --- a/scripts/serve-lan-production +++ b/scripts/serve-lan-production @@ -1,4 +1,4 @@ #!/bin/bash sudo iptables -I INPUT -p tcp --dport 4000 -j ACCEPT -JEKYLL_ENV=production jekyll serve --host "0.0.0.0" --baseurl "" +JEKYLL_ENV=production jekyll serve --host "0.0.0.0" --config _config.yml,_config.dev.yml diff --git a/scripts/serve-production b/scripts/serve-production index 5c4736b..691b5db 100755 --- a/scripts/serve-production +++ b/scripts/serve-production @@ -1,3 +1,3 @@ #!/bin/bash -JEKYLL_ENV=production jekyll serve --host "127.0.0.1" --baseurl "" +JEKYLL_ENV=production jekyll serve --host "127.0.0.1" --config _config.yml,_config.dev.yml From ab376edfd4e43ef27db5005a7a415d3d2a75ad4e Mon Sep 17 00:00:00 2001 From: Jorge Arias Date: Mon, 12 Mar 2018 02:35:48 -0300 Subject: [PATCH 2/4] Added Docker run instructions and Docker Compose file --- README.md | 13 +++++++++++++ docker-compose.yml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 631e841..b2f488b 100755 --- a/README.md +++ b/README.md @@ -67,6 +67,19 @@ To serve across lan (requires su to forward the port 4000 over lan): ./scripts/serve-lan-production ``` +### Docker + +Run using Docker: + +``` +docker run --rm -it -p 4000:4000 -v "$PWD:/srv/jekyll" jekyll/jekyll jekyll serve --watch --host "0.0.0.0" --config _config.yml,_config.dev.yml +``` + +Run using Docker with Docker Compose: +``` +docker-compose up +``` + ## OSS used in { Personal } One of the reasons { Personal } is real is the following OSS projects: diff --git a/docker-compose.yml b/docker-compose.yml index 2034e74..08eb477 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: image: jekyll/jekyll ports: - "4000:4000" - command: /bin/bash -c 'PATH=$$PATH:/srv/jekyll/scripts; serve-lan' + command: jekyll serve --watch --host "0.0.0.0" --config _config.yml,_config.dev.yml volumes: - .:/srv/jekyll From 58e6113fa43a0d57f28a0258b694a2d06e169ea7 Mon Sep 17 00:00:00 2001 From: Jorge Arias Date: Mon, 12 Mar 2018 02:45:14 -0300 Subject: [PATCH 3/4] Updated Ruby version in .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fd4dd10..5c6fe5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby rvm: -- 2.2.2 +- 2.5 install: gem install jekyll jekyll-paginate jemoji html-proofer script: jekyll serve --baseurl "" --detach && htmlproofer ./_site --disable-external --empty-alt-ignore From bbe99000ceb9f9fc96a0576792c92596971690f0 Mon Sep 17 00:00:00 2001 From: Panos Sakkos Date: Mon, 10 Sep 2018 18:18:11 +0300 Subject: [PATCH 4/4] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index fc28f43..0bcfafc 100755 --- a/_config.yml +++ b/_config.yml @@ -122,7 +122,7 @@ pinterest-share: True pocket-share: True vkontakte-share: True -disqus-shortname: "panossakkos" +disqus-shortname: "personal-jekyll-theme" syntax-highlight: True