Merge pull request #1198 from alphagov/sengi/base-image

Use govuk-ruby-images and disable pidfile.
alphagov · Feb 27, 2024 · f7ba6db · f7ba6db
2 parents 796dfdd + d5d4077
commit f7ba6db
Show file tree

Hide file tree

Showing 10 changed files with 366 additions and 208 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,14 @@
+.dockerignore
+.git
+.gitignore
+.github
+Dockerfile
+README.md
+coverage
+docs
+log
+node_modules
+spec
+test
+tmp
+vendor/bundle
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,5 @@
 source "https://rubygems.org"
 
-ruby File.read(".ruby-version").strip
-
 gem "rails", "7.0.5.1"
 
 gem "addressable"
@@ -27,6 +25,7 @@ gem "net-smtp"
 gem "nokogiri"
 gem "parslet"
 gem "pg"
+gem "plek", "~> 4.1" # TODO: unconstrain once govuk_pub_components up-to-date.
 gem "puma"
 gem "redcarpet"
 gem "rest-client"