Skip to content

Commit

Permalink
Fixed blank baseurl param problem with multiple configuration files
Browse files Browse the repository at this point in the history
  • Loading branch information
joariasl committed Mar 12, 2018
1 parent 67e0345 commit 7f72dda
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 4 deletions.
1 change: 1 addition & 0 deletions _config.dev.yml
@@ -0,0 +1 @@
baseurl: ""
11 changes: 11 additions & 0 deletions 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

2 changes: 1 addition & 1 deletion 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
2 changes: 1 addition & 1 deletion scripts/serve-lan 100644 → 100755
@@ -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 changes: 1 addition & 1 deletion scripts/serve-lan-production 100644 → 100755
@@ -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
2 changes: 1 addition & 1 deletion 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

0 comments on commit 7f72dda

Please sign in to comment.