Merge pull request #107 from epimorphics/spike/dev-security-updates

Spike/dev security updates
epimorphics · Oct 3, 2023 · 362c05a · 362c05a
2 parents 3b11af0 + 2be83eb
commit 362c05a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,7 @@ RUN apk add --update \
     nodejs \
     tzdata \
     && rm -rf /var/cache/apk/* \
+    && gem update --system \
     && gem install bundler:$BUNDLER_VERSION \
     && bundle config --global frozen 1
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -85,7 +85,7 @@ GEM
     ffi (1.15.5)
     font-awesome-rails (4.7.0.8)
       railties (>= 3.2, < 8.0)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     govuk_elements_rails (2.0.0)
       govuk_frontend_toolkit (>= 4.14.1)
@@ -111,7 +111,7 @@ GEM
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
     http_accept_language (2.1.1)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
@@ -141,12 +141,12 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.15.0)
+    minitest (5.17.0)
     modernizr-rails (2.7.1)
     modulejs-rails (2.2.0.0)
       railties (>= 4.0)
     multipart-post (2.3.0)
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     nokogiri (1.13.10-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.13.10-x86_64-linux)
@@ -155,10 +155,10 @@ GEM
     parser (3.1.1.0)
       ast (~> 2.4.1)
     prometheus-client (4.0.0)
-    puma (5.6.4)
+    puma (5.6.7)
       nio4r (~> 2.0)
     racc (1.6.2)
-    rack (2.2.7)
+    rack (2.2.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.7)
@@ -280,6 +280,7 @@ GEM
 PLATFORMS
   x86_64-darwin-17
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -302,4 +303,4 @@ DEPENDENCIES
   web-console
 
 BUNDLED WITH
-   2.4.4
+   2.4.20
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .PHONY:	assets clean image lint publish realclean run tag test vars
 
 ACCOUNT?=$(shell aws sts get-caller-identity | jq -r .Account)
-ALPINE_VERSION?=3.12
+ALPINE_VERSION?=3.13
 AWS_REGION?=eu-west-1
 BUNDLER_VERSION?=$(shell tail -1 Gemfile.lock | tr -d ' ')
 ECR?=${ACCOUNT}.dkr.ecr.eu-west-1.amazonaws.com