Fixed blank baseurl param problem with multiple configuration files

This commit is contained in:
Jorge Arias 2018-03-12 01:45:20 -03:00
parent 67e0345d47
commit 7f72dda5b7
6 changed files with 16 additions and 4 deletions

1
_config.dev.yml Normal file
View file

@ -0,0 +1 @@
baseurl: ""

11
docker-compose.yml Normal file
View file

@ -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

View file

@ -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

2
scripts/serve-lan Normal file → Executable file
View file

@ -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

2
scripts/serve-lan-production Normal file → Executable file
View file

@ -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

View file

@ -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