diff --git a/.ruby-version b/.ruby-version index 338a5b5..e261122 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.6 +2.6.7 diff --git a/Gemfile b/Gemfile index e61a083..dc59f62 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ end # ! These "local" paths do not work with a docker image - use the repo instead # gem 'qonsole-rails', path: '~/Epimorphics/clients/land-registry/projects/qonsole-rails' # gem 'json_rails_logger', '~> 1.0.0', path: '~/Epimorphics/shared/json-rails-logger/' -# gem 'lr_common_styles', '~> 1.9.0', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles/' +gem 'lr_common_styles', '~> 1.9.9', path: '~/lr_common_styles/' # rubocop:enable Layout/LineLength # TODO: In production you want to set this to the gem from the epimorphics github repo @@ -47,5 +47,5 @@ gem 'qonsole-rails', git: 'https://github.com/epimorphics/qonsole-rails' # TODO: In production you want to set this to the gem from the epimorphics package repo source 'https://rubygems.pkg.github.com/epimorphics' do gem 'json_rails_logger', '~> 1.0.0' - gem 'lr_common_styles', '~> 1.9.0' + # gem 'lr_common_styles', '~> 1.9.0' end diff --git a/Gemfile.lock b/Gemfile.lock index f484d58..e9c61f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,6 +15,23 @@ GIT modulejs-rails (~> 2.2.0.0) rails (~> 5.2.4) +PATH + remote: ../lr_common_styles + specs: + lr_common_styles (1.9.9) + bootstrap-sass (~> 3.4.0) + font-awesome-rails (~> 4.7.0.1) + govuk_elements_rails (~> 2.0.0) + govuk_frontend_toolkit (~> 4.18.1) + govuk_template (~> 0.18.1) + haml-rails (~> 2.0.0) + jquery-rails (>= 4.3.5, < 4.7.0) + lodash-rails (~> 4.17.14) + modernizr-rails (~> 2.7.1) + modulejs-rails (~> 2.2.0.0) + rails (~> 5.2.4) + sass-rails (~> 5.0.4) + GEM remote: https://rubygems.org/ specs: @@ -265,19 +282,6 @@ GEM json lograge railties - lr_common_styles (1.9.9) - bootstrap-sass (~> 3.4.0) - font-awesome-rails (~> 4.7.0.1) - govuk_elements_rails (~> 2.0.0) - govuk_frontend_toolkit (~> 4.18.1) - govuk_template (~> 0.18.1) - haml-rails (~> 2.0.0) - jquery-rails (>= 4.3.5, < 4.7.0) - lodash-rails (~> 4.17.14) - modernizr-rails (~> 2.7.1) - modulejs-rails (~> 2.2.0.0) - rails (~> 5.2.4) - sass-rails (~> 5.0.4) PLATFORMS x86_64-darwin-17 @@ -293,7 +297,7 @@ DEPENDENCIES jbuilder (~> 2.0) jquery-rails json_rails_logger (~> 1.0.0)! - lr_common_styles (~> 1.9.0)! + lr_common_styles (~> 1.9.9)! prometheus-client (~> 4.0) puma qonsole-rails! @@ -306,4 +310,4 @@ DEPENDENCIES web-console BUNDLED WITH - 2.4.8 + 2.4.20 diff --git a/Makefile b/Makefile index a8aa0c4..6cbf7d5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: assets auth check clean image lint local publish realclean run tag test vars ACCOUNT?=$(shell aws sts get-caller-identity | jq -r .Account) -ALPINE_VERSION?=3.13 +ALPINE_VERSION?=3.16 AWS_REGION?=eu-west-1 BUNDLER_VERSION?=$(shell tail -1 Gemfile.lock | tr -d ' ') ECR?=${ACCOUNT}.dkr.ecr.eu-west-1.amazonaws.com