diff --git a/Dockerfile b/Dockerfile index 9769fa11..3c02593e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,8 +12,8 @@ RUN bundle install COPY . /site/ RUN bundle exec rake build:production -FROM nginx:alpine +FROM docker.io/galenguyer/nginx:1.21.6-alpine-spa RUN rm -rf /usr/share/nginx/html/* -COPY --from=builder /site/_site/ /usr/share/nginx/html +COPY --from=builder /site/_site/ /usr/share/nginx/html/ diff --git a/Gemfile b/Gemfile index 67c8cf25..4c7f8a5f 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.8.4" +gem "jekyll" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.5" @@ -22,6 +22,7 @@ group :jekyll_plugins do gem "jekyll-feed", "~> 0.6" gem "liquid-md5" gem "jekyll-regex-replace" + gem "webrick" end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 46797886..2aa7ddb5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,79 +1,87 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.8) - em-websocket (0.5.2) + concurrent-ruby (1.1.10) + 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.15.0) + ffi (1.15.5) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) - i18n (0.9.5) + http_parser.rb (0.8.0) + i18n (1.10.0) concurrent-ruby (~> 1.0) - jekyll (3.8.7) + jekyll (4.2.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 3.0) safe_yaml (~> 1.0) - jekyll-feed (0.10.0) - jekyll (~> 3.3) + terminal-table (~> 2.0) + jekyll-feed (0.16.0) + jekyll (>= 3.7, < 5.0) jekyll-regex-replace (1.1.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-seo-tag (2.7.1) + jekyll-sass-converter (2.2.0) + sassc (> 2.0.1, < 3.0) + jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.3) liquid-md5 (0.0.3) liquid (>= 2.5, < 5.0) - listen (3.5.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) 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 (4.0.6) + public_suffix (4.0.7) rake (12.3.3) - rb-fsevent (0.10.4) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.26.0) + rexml (3.2.5) + rouge (3.29.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) + sassc (2.4.0) + ffi (~> 1.9) + terminal-table (2.0.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.8.0) + webrick (1.7.0) PLATFORMS - ruby + x86_64-linux DEPENDENCIES - jekyll (~> 3.8.4) + jekyll jekyll-feed (~> 0.6) jekyll-regex-replace liquid-md5 minima (~> 2.5) rake (~> 12.3) tzinfo-data + webrick BUNDLED WITH - 2.2.3 + 2.3.17 diff --git a/about/sponsors.html b/about/sponsors.html index ed191036..bf640678 100644 --- a/about/sponsors.html +++ b/about/sponsors.html @@ -194,6 +194,16 @@ Tenable +
+ + Wayfair + +
+
+ + Johonnot + +
diff --git a/assets/js/sponsors.js b/assets/js/sponsors.js index a31f75a2..7af84d83 100644 --- a/assets/js/sponsors.js +++ b/assets/js/sponsors.js @@ -45,6 +45,9 @@ $(document).ready(() => { new Sponsor('https://assets.csh.rit.edu/pubsite/sponsors/slack.png', 'https://slack.com/', 'Slack'), new Sponsor('https://assets.csh.rit.edu/pubsite/sponsors/proxmox.png', 'https://proxmox.com/', 'Proxmox'), new Sponsor('https://assets.csh.rit.edu/pubsite/sponsors/tenable.png', 'https://tenable.com/', 'Tenable'), + new Sponsor('https://assets.csh.rit.edu/pubsite/sponsors/wayfair.png', 'https://wayfair.com/', 'Wayfair'), + new Sponsor('https://assets.csh.rit.edu/pubsite/sponsors/johonnot.png', 'https://johonnottechnologies.com/', 'Johonnot'), + ]; for (let i = 0; i <= 6; i++) {