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.

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

Ca upstream #1584

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
612d054
Get this ready for dokku hopefully
coreyja Oct 1, 2018
55ed104
Add pre and post deploy scripts
coreyja Oct 1, 2018
11b5276
Merge pull request #1 from octobox/master
coreyja Oct 16, 2018
bfb18d3
Merge branch 'master' of github.com:coreyja/octobox
coreyja Oct 16, 2018
fcad3e9
Merge pull request #2 from octobox/master
coreyja Oct 25, 2018
4481b32
Merge pull request #3 from octobox/master
coreyja Oct 30, 2018
6380878
Try just using the jemalloc base my other projects are using
coreyja Nov 3, 2018
1f60750
Use apt-get
coreyja Nov 3, 2018
18ed6f8
Remove stuff that can't install
coreyja Nov 3, 2018
212cd7b
Change ruby version in Gemfile to match version in jemalloc docker base
coreyja Nov 3, 2018
dccbe96
Install mysqldev in Dockerfile
coreyja Nov 3, 2018
ea99a9f
install git
coreyja Nov 3, 2018
9debdf5
Merge pull request #4 from octobox/master
coreyja Nov 15, 2018
0fc88c2
Merge branch 'master' of github.com:coreyja/octobox
coreyja Nov 15, 2018
8cc8080
Try this for dokku deploy scripts
coreyja Nov 15, 2018
13aa553
I'm gonna use 2.5.3 for Ruby. Want this on Master before I branch off
coreyja Nov 20, 2018
dad0951
Merge branch 'master' of github.com:octobox/octobox
coreyja Nov 20, 2018
735ca3f
feat: Merge pull request #5 from octobox/master
coreyja Dec 6, 2018
84d35a1
Lets stay on 2.5.1 cause of my custom dockerfile
coreyja Dec 6, 2018
ab7db64
Revert "Lets stay on 2.5.1 cause of my custom dockerfile"
coreyja Dec 23, 2018
f991721
Merge pull request #6 from octobox/master
coreyja Dec 23, 2018
7746390
Try Dockerfile from master
coreyja Dec 26, 2018
a22de1d
Add datadog
coreyja Dec 27, 2018
40ee47e
Try this for ddagent support
coreyja Dec 27, 2018
188fbaf
Merge pull request #7 from octobox/master
coreyja Dec 28, 2018
a580949
Merge branch 'master' of github.com:coreyja/octobox
coreyja Dec 28, 2018
ec261bb
Merge pull request #8 from octobox/master
coreyja Jan 13, 2019
3886969
--no-edit
coreyja Feb 16, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Gemfile
Expand Up @@ -39,6 +39,8 @@ gem 'commonmarker'
gem 'mysql2', require: false
gem 'pg', '1.1.4', require: false

gem 'ddtrace'

group :development, :test do
gem 'byebug', platform: :mri
gem 'dotenv-rails'
Expand Down
9 changes: 7 additions & 2 deletions Gemfile.lock
Expand Up @@ -94,6 +94,9 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.4)
ddtrace (0.18.1)
msgpack
opentracing (>= 0.4.1)
debug_inspector (0.0.3)
docile (1.3.1)
dotenv (2.6.0)
Expand Down Expand Up @@ -225,8 +228,9 @@ GEM
omniauth-oauth2 (1.6.0)
oauth2 (~> 1.1)
omniauth (~> 1.9)
parallel (1.13.0)
parser (2.6.0.0)
opentracing (0.4.3)
parallel (1.12.1)
parser (2.5.3.0)
ast (~> 2.4.0)
percy-capybara (3.2.0)
addressable (~> 2)
Expand Down Expand Up @@ -418,6 +422,7 @@ DEPENDENCIES
byebug
capybara
commonmarker
ddtrace
dotenv-rails
factory_bot
faraday_middleware
Expand Down
4 changes: 4 additions & 0 deletions app.json
Expand Up @@ -3,6 +3,10 @@
"description": "Untangle your GitHub Notifications",
"repository": "https://github.com/octobox/octobox",
"scripts": {
"dokku": {
"predeploy": "bundle exec rake assets:precompile",
"postdeploy": "bundle exec rake db:migrate"
},
"postdeploy": "bundle exec rake db:migrate"
},
"keywords": [
Expand Down
5 changes: 5 additions & 0 deletions config/initializers/datadog-tracer.rb
@@ -0,0 +1,5 @@
Datadog.configure do |c|
c.use :rails, service_name: 'octobox'
c.tracer hostname: ENV['DD_AGENT_PORT_8126_TCP_ADDR'],
port: ENV['DD_AGENT_PORT_8126_TCP_PORT']
end