diff --git a/Dockerfile b/Dockerfile index a8d5722..d005570 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,18 @@ # uncomment the version of ruby that you want to run #FROM ruby:2.4 #FROM ruby:2.5 -FROM ruby:2.6 +#FROM ruby:2.6 +FROM ruby:latest RUN mkdir /usr/src/app ADD . /usr/src/app/ WORKDIR /usr/src/app/ RUN gem update --system -RUN gem install bundler:2.0.1 +#RUN gem install bundler:2.0.1 +RUN gem install bundler RUN bundle install WORKDIR /usr/src/app -CMD ["jekyll", "serve", "--incremental"] \ No newline at end of file +CMD ["jekyll", "serve", "--incremental", "--host", "0.0.0.0"] diff --git a/Gemfile b/Gemfile index 4943da0..8e56cba 100644 --- a/Gemfile +++ b/Gemfile @@ -8,10 +8,12 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "3.8.5" +#gem "jekyll", "3.8.5" +gem "jekyll", "3.10.0" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.5.0" +gem "kramdown-parser-gfm" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. diff --git a/Gemfile.lock b/Gemfile.lock index 33299f9..b1351c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,77 +1,103 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) colorator (1.1.0) - concurrent-ruby (1.1.4) - em-websocket (0.5.1) + concurrent-ruby (1.3.3) + csv (3.3.0) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.10.0) + ffi (1.17.0) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-aarch64-linux-musl) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm-linux-musl) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86-linux-musl) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) + ffi (1.17.0-x86_64-linux-musl) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) - i18n (0.9.5) + http_parser.rb (0.8.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.10.0) addressable (~> 2.4) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (>= 1.17, < 3) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.11.0) - jekyll (~> 3.3) - jekyll-jupyter-notebook (0.0.4) - jekyll + webrick (>= 1.0) + jekyll-feed (0.17.0) + jekyll (>= 3.7, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-watch (2.1.2) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) + jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) - liquid (4.0.1) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - minima (2.5.0) - jekyll (~> 3.5) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + public_suffix (6.0.0) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rouge (3.3.0) - ruby_dep (1.5.0) - safe_yaml (1.0.4) - sass (3.7.3) + rexml (3.3.1) + strscan + rouge (3.30.0) + safe_yaml (1.0.5) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + strscan (3.1.0) + webrick (1.8.1) PLATFORMS + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin ruby + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES - jekyll (= 3.8.5) + jekyll (= 3.10.0) jekyll-feed (~> 0.6) - jekyll-jupyter-notebook + kramdown-parser-gfm minima (~> 2.5.0) tzinfo-data BUNDLED WITH - 2.0.1 + 2.5.14 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..3a4388e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,7 @@ +services: + brendan-website: + build: + context: ./ + dockerfile: Dockerfile + ports: + - '4000:4000'