diff --git a/.gitignore b/.gitignore index ab1cbe8c5..7522bc4a3 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ /coverage-frontend .DS_Store /node_modules +/bonnie-data # Ignore IDE configuration files. .idea diff --git a/Dockerfile b/Dockerfile index e9abff7dd..9f9ea1c7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ 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 14694eb2a..e8288b6b4 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -11,6 +11,17 @@ <%= render 'layouts/framebreaker' %> +
diff --git a/config/bonnie.yml b/config/bonnie.yml index 5a246a9de..6b6a59bc7 100644 --- a/config/bonnie.yml +++ b/config/bonnie.yml @@ -1,5 +1,5 @@ defaults: &defaults - version: 5.1.5 + version: 5.1.6 enable_logging: true enable_rationale: true check_crosswalk: false diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..0cd61490c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,29 @@ +version: "3" +services: + bonnie: + image: bonnie-qdm +# build: +# context: . + ports: + - "3000:80" + depends_on: + - "bonnie-mongo" + environment: + - SAML_IDP_METADATA=${SAML_IDP_METADATA} + - SAML_SP_ENTITY_ID=${SAML_SP_ENTITY_ID} + - SAML_ASSERTION_CONSUMER_SERVICE_URL=${SAML_ASSERTION_CONSUMER_SERVICE_URL} + - SAML_SP_CERT=${SAML_SP_CERT} + - SAML_SP_KEY=${SAML_SP_KEY} + - BONNIE_PATIENT_CONV_URL=${BONNIE_PATIENT_CONV_URL} + - MONGODB_URI=${MONGODB_URI} + - SECRET_KEY_BASE=${SECRET_KEY_BASE} + - PASSENGER_APP_ENV=${PASSENGER_APP_ENV} + + bonnie-mongo: + image: mongodb/mongodb-community-server:4.4.25-ubuntu2004 + restart: always + container_name: 'bonnie-mongo' + ports: + - "27017:27017" + volumes: + - ./bonnie-data/data:/data/db diff --git a/package-lock.json b/package-lock.json index 898925ba2..80b779e16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bonnie", - "version": "5.1.5", + "version": "5.1.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bonnie", - "version": "5.1.5", + "version": "5.1.6", "license": "Apache-2.0", "dependencies": { "browserify": "^17.0.0", diff --git a/package.json b/package.json index a0ebd1d63..4641d1b92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bonnie", - "version": "5.1.5", + "version": "5.1.6", "description": "A tool for testing electronic clinical quality measures", "main": "index.js", "repository": "git@github.com:MeasureAuthoringTool/bonnie.git",