Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove --ignore CVE-2015-9284 from dpc-admin Dockerfile #2305

Merged
merged 1 commit into from
Oct 29, 2024
Merged

Remove --ignore CVE-2015-9284 from dpc-admin Dockerfile #2305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dpc-admin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN gem install bundler --no-document && \
npm install

# Run bundler audit
RUN bundle exec bundle audit update && bundle exec bundle audit check --ignore CVE-2015-9284
RUN bundle exec bundle audit update && bundle exec bundle audit check

# Copy the code, test the app, and build the assets pipeline
COPY /dpc-admin /dpc-admin
Expand Down
5 changes: 2 additions & 3 deletions dpc-admin/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ gem 'dotenv-rails', groups: [:development, :test]
gem 'puma', '~> 6.4.3'
gem 'redis', '~> 4.0'
gem 'luhnacy', '~> 0.2.1'
gem 'omniauth-rails_csrf_protection', '~> 0.1.2'
gem 'omniauth-rails_csrf_protection', '~> 1.0'
gem 'sidekiq', '~> 7.2.4'
gem 'turbolinks', '~> 5'
gem 'newrelic_rpm', '~> 8.10'
Expand All @@ -34,8 +34,7 @@ gem 'devise'
gem 'devise-async'
gem 'devise-security'
gem 'health_check'
gem 'omniauth-github', '~> 1.4.0'
gem 'omniauth-oktaoauth', '~> 0.1.6'
gem 'omniauth-github', '~> 2.0.0'
gem 'octokit' # can be removed once we move past github omniauth
gem 'fhir_models'
gem 'sidekiq_alive', '~> 2.1.5'
Expand Down
30 changes: 15 additions & 15 deletions dpc-admin/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,21 +259,19 @@ GEM
base64
faraday (>= 1, < 3)
sawyer (~> 0.9)
omniauth (1.9.2)
omniauth (2.1.2)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
omniauth-github (1.4.0)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-oauth2 (1.7.3)
rack (>= 2.2.3)
rack-protection
omniauth-github (2.0.1)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.8)
omniauth-oauth2 (1.8.0)
oauth2 (>= 1.4, < 3)
omniauth (>= 1.9, < 3)
omniauth-oktaoauth (0.1.6)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-rails_csrf_protection (0.1.2)
omniauth (~> 2.0)
omniauth-rails_csrf_protection (1.0.2)
actionpack (>= 4.2)
omniauth (>= 1.3.1)
omniauth (~> 2.0)
orm_adapter (0.5.0)
parallel (1.24.0)
parser (3.3.1.0)
Expand All @@ -292,6 +290,9 @@ GEM
nio4r (~> 2.0)
racc (1.7.3)
rack (2.2.8.1)
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
rack-session (1.0.2)
rack (< 3)
rack-test (2.1.0)
Expand Down Expand Up @@ -500,9 +501,8 @@ DEPENDENCIES
newrelic_rpm (~> 8.10)
nokogiri (>= 1.16.5)
octokit
omniauth-github (~> 1.4.0)
omniauth-oktaoauth (~> 0.1.6)
omniauth-rails_csrf_protection (~> 0.1.2)
omniauth-github (~> 2.0.0)
omniauth-rails_csrf_protection (~> 1.0)
pg (>= 0.18, < 2.0)
pry
pry-nav
Expand Down
Loading