From f5d2c601838754116dc28cf95bf578f796dc22b3 Mon Sep 17 00:00:00 2001 From: Joseph Kotanchik Date: Thu, 4 Apr 2024 11:47:31 -0400 Subject: [PATCH 1/3] MAT-6896: Add decommission notice banner to login page. --- app/assets/stylesheets/landing.less | 14 ++++++++++++++ app/views/home/show.html.erb | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/app/assets/stylesheets/landing.less b/app/assets/stylesheets/landing.less index bd2843b5b..7a909dc5e 100644 --- a/app/assets/stylesheets/landing.less +++ b/app/assets/stylesheets/landing.less @@ -1,3 +1,17 @@ +.decommissioning-banner { + display: flex; + align-items: center; + padding: 2rem; + background-color: white; + margin-left: 13%; + margin-right: 6%; + > div { + flex-direction: column; + text-align: left; + padding-left: 30px; + } +} + .container { padding: 1em; } diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index 59dfbba7a..fec89b395 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -11,6 +11,17 @@ <%= render 'layouts/framebreaker' %> +
From a2559f04566f68e9216fc7db3ba38caa880ea5f3 Mon Sep 17 00:00:00 2001 From: Brendan Donohue <30727645+sb-bdonohue@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:33:53 -0400 Subject: [PATCH 2/3] modify dockerfile to fix build issues (#2209) --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4013a65f7..9f9ea1c7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/passenger-full +FROM phusion/passenger-full:2.5.1 ARG PASSENGER_APP_ENV=production @@ -9,7 +9,6 @@ ADD bonnie.conf /etc/nginx/sites-enabled/bonnie.conf COPY --chown=app:app . /home/app/bonnie -RUN bash -lc "rvm install ruby-${RUBY_VERSION} && rvm --default use ruby-${RUBY_VERSION}" RUN rm -f /etc/service/nginx/down \ && rm -f /etc/nginx/sites-enabled/default \ @@ -20,6 +19,9 @@ RUN rm -f /etc/service/nginx/down \ && apt-get install shared-mime-info -y RUN su - app -c "cd /home/app/bonnie \ + && rvm autolibs disable \ + && rvm install ruby-${RUBY_VERSION} \ + && rvm --default use ruby-${RUBY_VERSION} \ && curl -O https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem \ && gem install bundler -v 2.1.4 \ && bundle install \ From a6d15f88a4e27d46441b7751bb2c0b65638607a3 Mon Sep 17 00:00:00 2001 From: Joseph Kotanchik Date: Tue, 9 Apr 2024 15:13:48 -0400 Subject: [PATCH 3/3] Bump prior version to 4.3.2 --- config/bonnie.yml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/bonnie.yml b/config/bonnie.yml index 3be37b140..33ca81ab8 100644 --- a/config/bonnie.yml +++ b/config/bonnie.yml @@ -1,5 +1,5 @@ defaults: &defaults - version: 4.3.1 + version: 4.3.2 enable_logging: true enable_rationale: true check_crosswalk: false diff --git a/package-lock.json b/package-lock.json index 371b00e6b..093a78827 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bonnie", - "version": "4.3.1", + "version": "4.3.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bonnie", - "version": "4.3.1", + "version": "4.3.2", "license": "Apache-2.0", "dependencies": { "browserify": "^17.0.0", diff --git a/package.json b/package.json index 6de3a5c69..12f56b0d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bonnie", - "version": "4.3.1", + "version": "4.3.2", "description": "A tool for testing electronic clinical quality measures", "main": "index.js", "repository": "git@github.com:MeasureAuthoringTool/bonnie.git",