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

Fix heroku 1 click #1055

Open
wants to merge 28 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
bfc5c6b
Test webrick gem
aapomm Jul 28, 2022
4924fbe
Try using puma
aapomm Jul 28, 2022
b526c08
Test puma
aapomm Jul 28, 2022
76e0083
Revert "Test puma"
aapomm Jul 28, 2022
1dc5166
Test hardcoded branch
aapomm Jul 28, 2022
aa420b6
Test webrick gem
aapomm Jul 28, 2022
6c9dbd5
Revert changes
aapomm Nov 28, 2022
ce8b881
Remove config usage
aapomm Nov 28, 2022
b3b3a4e
Merge branch 'develop' into fix-heroku-1-click
aapomm Jan 6, 2023
61cb6a0
Test hardcoded port
aapomm Jan 6, 2023
1b4da2c
Try using postgresql addon
aapomm Jan 6, 2023
b5d3634
Merge branch 'fix-heroku-1-click' of github.com:dradis/dradis-ce into…
etdsoft Feb 9, 2023
27a8db1
Add Heroku DB bypass
etdsoft Feb 9, 2023
6167430
Bump Ruby version to 3.1.3
etdsoft Feb 9, 2023
e25dc5c
Temporarily add HEROKU_DEBUG_RAILS_RUNNER
etdsoft Feb 9, 2023
5fce6c3
Test ruby version revert
aapomm Apr 27, 2023
182c8f6
Merge branch 'develop' into fix-heroku-1-click
aapomm Apr 27, 2023
022aad2
Add HEROKU_DEBUG_RAILS_RUNNER
aapomm Apr 27, 2023
57ab759
Temporarily remove heroku button and add changelog entry
aapomm Apr 28, 2023
8d30f6d
Remove unused heroku scripts
aapomm May 11, 2023
22610fc
Rename app platform initializer
aapomm May 11, 2023
b911968
Merge branch 'develop' into fix-heroku-1-click
aapomm Apr 3, 2024
da15fa2
Set dev environment
aapomm Apr 4, 2024
0755a8c
Set cable production to async and revert to prod env
aapomm Apr 4, 2024
5c8596b
Remove unused procfile
aapomm Apr 4, 2024
ac44e91
Test remove matrix
aapomm Apr 4, 2024
18a4400
Move initializer to dradis-plugins and improve cable.yml parity with pro
aapomm Apr 5, 2024
35971b9
Use memory_store
aapomm Apr 11, 2024
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
4 changes: 3 additions & 1 deletion .do/deploy.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ spec:
- key: RAILS_SERVE_STATIC_FILES
value: enabled
scope: RUN_TIME
- key: HEROKU_DEBUG_RAILS_RUNNER
value: '1'
aapomm marked this conversation as resolved.
Show resolved Hide resolved
git:
branch: develop
branch: fix-heroku-1-click
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be reverted to develop once merged/before merging.

repo_clone_url: https://github.com/dradis/dradis-ce.git
name: web
run_command: ./bin/setup
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- Upgraded gems:
- nokogiri, rails
- Bugs fixes:
- Digital Ocean: Fix one click deploy button
- Tylium: Fix redirection when updating an issue or content block
- Bug tracker items:
- [item]
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

Dradis is an open-source collaboration framework, tailored to InfoSec teams.

<a href="https://heroku.com/deploy?template=https://github.com/dradis/dradis-ce/tree/develop" target="_blank"><img src="https://www.herokucdn.com/deploy/button.svg" height="40"></a>
<a href="https://cloud.digitalocean.com/apps/new?repo=https://github.com/dradis/dradis-ce/tree/develop" target="_blank"><img src="https://www.deploytodo.com/do-btn-blue.svg" height="40"></a>

To try Dradis Community, you can deploy your own instance (you will need accounts in the cloud providers to get started).
Expand Down
28 changes: 0 additions & 28 deletions app.json

This file was deleted.

24 changes: 0 additions & 24 deletions bin/heroku

This file was deleted.

4 changes: 1 addition & 3 deletions config/cable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ test:
adapter: test

production:
adapter: redis
url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
channel_prefix: dradispro_production
adapter: async
aapomm marked this conversation as resolved.
Show resolved Hide resolved
21 changes: 21 additions & 0 deletions config/initializers/_preprovision_database.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# In App Platforms, assets:precompile is run before the DB is provisioned causing a
aapomm marked this conversation as resolved.
Show resolved Hide resolved
# ActiveRecord::ConnectionNotEstablished: connection to server at "127.0.0.1",
# port 5432 failed: Connection refused
#
# We run into this problem because dradis-plugins uses a :enabled/disabled DB
# setting for each integration to decide whether to load them or not.
#
# See:
# https://devcenter.heroku.com/articles/rails-asset-pipeline
#

Rails.application.reloader.to_prepare do
# This is set by the App Platforms
if ENV['DATABASE_URL']
# DB isn't ready yet
if !(ActiveRecord::Base.connection rescue false)
# Empty the list of integrations.
Dradis::Plugins::class_variable_set('@@enabled_list', [])
end
end
end
Loading