Merge pull request #84 from bamr87/master

build fixes for theme

Dockerfile

@@ -25,5 +25,11 @@ EXPOSE 4002
 # EXPOSE 4000 80
 
 # Run Jekyll when the container launches
-CMD ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"]
+CMD ["bundle", "exec", "jekyll", "serve", "--config", "_config.yml,_config_dev.yml", "--host", "0.0.0.0"]
 # CMD jekyll serve -d /_site --watch --force_polling -H 0.0.0.0 -P 4000
+
+# source .env
+# docker build -t ${GIT_REPO} .
+# docker run -d -p 4002:4002 -v ${ZREPO}:/app --name ${GIT_REPO}-container ${GIT_REPO}
+# docker start ${GIT_REPO}-container
+# docker exec -it ${GIT_REPO}-container /bin/bash

Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
+# gemspec
 
 # This is where you define which Jekyll version to use for your site.
 # This site is using the GitHub Pages gem, which is updated regularly.
@@ -10,10 +11,14 @@ source "https://rubygems.org"
 # Github Pages Gems:
 gem 'github-pages'
 
+# Jekyll Theme
+gem 'jekyll-theme-zer0'
+
 # If you have plugins enabled in the _config.yml, add them here too:
 group :jekyll_plugins do
 
   # these are all part of the github-pages gem
+  gem 'jekyll-remote-theme', "~> 0.4.3"
   gem 'jekyll-feed', "~> 0.17"
   gem 'jekyll-sitemap' , "~> 1.4.0"
   gem 'jekyll-seo-tag', "~> 2.8.0"

_config.yml

@@ -54,7 +54,7 @@ domain_ext               : ".dev"
 sub_domain               : &sub_domain ""
 baseurl                  : "" # the subpath of your site, e.g. /blog - Use this if you want this whole repo to be a domain branch
 url_dev                  : ['https://', *sub_domain, '.', *domain, *domain_ext ] # the base hostname & protocol for your site, e.g. http://example.com
-url                      : 'https://it-journey.dev' # the base hostname & protocol for your site, e.g. http://example.com
+url                      : &url 'https://it-journey.dev' # the base hostname & protocol for your site, e.g. http://example.com
 public_folder            : "/assets"
 port                     : 4002 # Jekyll Serve Dev port
 dg_port                  : 4001 # TODO: Doppelganger site. Use this if you want to switch between parallel deployments
@@ -186,6 +186,7 @@ powered_by:
 
 plugins:
   - github-pages
+  - jekyll-remote-theme
   - jekyll-feed
   - jekyll-sitemap
   - jekyll-seo-tag

_config_dev.yml

@@ -0,0 +1,4 @@
+# Dev config override
+
+remote_theme             : false
+theme                    : "jekyll-theme-zer0"

_includes/branding.html

@@ -33,7 +33,7 @@
 <div class="navbar-brand">
     <!-- If a subtitle exsits -->
     {%- if site.subtitle -%}
-    <a class="nav-link" href="http://localhost:{{ site.port }}{{ page.url }}">
+    <a class="nav-link" href="http://localhost:{{ site.port }}{{ site.baseurl}}{{ page.url }}">
         <i class="d-sm-inline d-md-none {{ site.default_icon }} {{ site.default_icon }}-{{ site.subtitle_icon | default: site.powered_by.default }}" aria-hidden="true"></i>
         <span class="d-none d-md-inline"> 
             {{ site.subtitle }}

zer0.md

@@ -30,7 +30,7 @@ snippet: What is a snippet?
 comments: true
 ---
 
-testing pr workflow again again, Damn it.
+testing pr workflow again again, Damn it. I think i figured it out.
 
 [![pages-build-deployment](https://github.com/bamr87/it-journey/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/bamr87/it-journey/actions/workflows/pages/pages-build-deployment)
 
@@ -321,10 +321,10 @@ docker build -t ${GIT_REPO} .
 
 ```shell
 # Run the container in detached mode
-docker run -d -p 4000:4000 -v ${ZREPO}:/app --name zer0_container ${GIT_REPO}
+docker run -d -p 4000:4000 -v ${ZREPO}:/app --name ${GIT_REPO}-container ${GIT_REPO}
 
 # Start the container and run the CMD line from the Dockerfile
-docker start zer0_container
+docker start ${GIT_REPO}-container
 
 ```