Merge pull request #382 from epimorphics/spike/base-image-rubygems-bu…

…ndler-updates Spike/base image rubygems bundler updates
epimorphics · Oct 6, 2023 · 59aa73a · 59aa73a
2 parents 851f9ae + 7370ea4
commit 59aa73a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,7 @@ RUN apk add --update \
     tzdata \
     yarn \
     && 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
@@ -405,4 +405,4 @@ DEPENDENCIES
   yajl-ruby
 
 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -405,4 +405,4 @@ DEPENDENCIES @@
       yajl-ruby
     BUNDLED WITH
-.4.4
+.4.20