Skip to content
This repository has been archived by the owner on Sep 29, 2021. It is now read-only.

Commit

Permalink
Merge pull request #28 from CruGlobal/dd_update
Browse files Browse the repository at this point in the history
[AP-10] Update Datadog Agent and Gems
  • Loading branch information
jbirdjavi committed May 5, 2020
2 parents 975263d + 0e4e6d4 commit cd910a0
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.5
2.6.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG RAILS_ENV=production
ARG SECRET_KEY_BASE

ARG DD_API_KEY
RUN DD_INSTALL_ONLY=true DD_API_KEY=$DD_API_KEY bash -c "$(curl -L https://raw.githubusercontent.com/DataDog/datadog-agent/master/cmd/agent/install_script.sh)"
RUN DD_AGENT_MAJOR_VERSION=7 DD_INSTALL_ONLY=true DD_API_KEY=$DD_API_KEY bash -c "$(curl -L https://raw.githubusercontent.com/DataDog/datadog-agent/master/cmd/agent/install_script.sh)"

# Config for logging to datadog
COPY docker/datadog-agent /etc/datadog-agent
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "2.6.5"
ruby "2.6.6"

gem "rails", "~> 5.2.3"
gem "active_model_serializers"
Expand Down
12 changes: 5 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GEM
awesome_print (1.6.1)
bootsnap (1.4.2)
msgpack (~> 1.0)
brakeman (4.8.0)
brakeman (4.8.1)
builder (3.2.4)
bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3)
Expand All @@ -75,7 +75,7 @@ GEM
cru-auth-lib (0.1.0)
active_model_serializers (>= 0.10.0.rc1)
redis (~> 3.3)
ddtrace (0.24.0)
ddtrace (0.34.2)
msgpack
diff-lcs (1.3)
docile (1.3.2)
Expand Down Expand Up @@ -140,8 +140,7 @@ GEM
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.0)
msgpack (1.3.0)
multi_json (1.14.1)
msgpack (1.3.3)
nenv (0.2.0)
newrelic_rpm (6.0.0.351)
nio4r (2.5.2)
Expand Down Expand Up @@ -202,8 +201,7 @@ GEM
redis (3.3.3)
request_store (1.4.1)
rack (>= 1.4)
rollbar (2.19.3)
multi_json
rollbar (2.25.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
Expand Down Expand Up @@ -331,7 +329,7 @@ DEPENDENCIES
xml-simple

RUBY VERSION
ruby 2.6.5p114
ruby 2.6.6p146

BUNDLED WITH
1.17.3

0 comments on commit cd910a0

Please sign in to comment.