Merge pull request #222 from 18F/dc/finish-search-updates

finish search updates and update deps/versions
cloud-gov · Nov 16, 2021 · f543121 · f543121
2 parents 4fd7e09 + c028206
commit f543121
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 306 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,6 +1,6 @@
 name: Build and test Jekyll USWDS
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.6
+2.7.4
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6.6
+FROM ruby:2.7.4
 
 RUN apt-get update && \
   apt-get install --reinstall -y locales && \
@@ -16,6 +16,7 @@ WORKDIR /app
 COPY Gemfile /app
 COPY Gemfile.lock /app
 
+RUN gem install bundler:1.17.2
 RUN bundle install
 
 EXPOSE 4000
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-ruby '>= 2.6.6'
+ruby '>= 2.7.4'
 
 source "https://rubygems.org"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -138,7 +138,7 @@ DEPENDENCIES
   tzinfo-data
 
 RUBY VERSION
-   ruby 2.6.6p146
+   ruby 2.7.4p191
 
 BUNDLED WITH
    1.17.2
diff --git a/_posts/2019-01-13-an-extra.md b/_posts/2019-01-13-an-extra.md
@@ -1,9 +1,10 @@
 ---
 title: An extra post for good measure
+description: This post is an example of an extra post for good measure
 layout: post
 date: January 13, 2019
 author: Author
-excerpt: This is an excerpt
+excerpt: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dapibus interdum pellentesque. Integer eu vehicula elit. Sed cursus magna in dui suscipit rhoncus.
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dapibus interdum pellentesque. Integer eu vehicula elit. Sed cursus magna in dui suscipit rhoncus.

diff --git a/_posts/2019-01-14-hello-world.md b/_posts/2019-01-14-hello-world.md
@@ -1,9 +1,10 @@
 ---
 title: A very long blog header that has a lot of detail but is still relevant
+description: This post has a long header
 layout: post
 date: January 14, 2019
 author: Abraham Lincoln
-excerpt: This is an excerpt
+excerpt: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dapibus interdum pellentesque. Integer eu vehicula elit. Sed cursus magna in dui suscipit rhoncus.
 image: hire-us.jpg
 image_alt_text: Hire Us
 ---

diff --git a/_posts/2019-01-15-second-post.md b/_posts/2019-01-15-second-post.md
@@ -1,5 +1,6 @@
 ---
 title: Second page
+description: The second page as it says
 layout: post
 date: January 15, 2019
 author: George Washington

diff --git a/_posts/2019-01-16-third-post.md b/_posts/2019-01-16-third-post.md
@@ -1,5 +1,6 @@
 ---
 title: Third page
+description: No confusion here, this is the third page
 layout: post
 date: January 16, 2019
 author: Benjamin Franklin

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   node:
-    image: node:12
+    image: node:14
     working_dir: /app
     volumes:
       - .:/app:delegated