-
Notifications
You must be signed in to change notification settings - Fork 98
refactor(docker): use profiles and make the docker-compose more configurable #659
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
refactor(docker): use profiles and make the docker-compose more configurable #659
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #659 +/- ##
==========================================
+ Coverage 68.87% 77.49% +8.62%
==========================================
Files 35 49 +14
Lines 4932 14835 +9903
==========================================
+ Hits 3397 11497 +8100
- Misses 1535 3338 +1803 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
26425ff to
cfa43c0
Compare
912b62d to
a411dfb
Compare
mojoX911
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
A configuration like below is not being connected to local bitcoind. I suppose it is trying to connect with the internal bitcoind? Error: For this config, where I am opting for a locally synced node, it should connect with the bitcoind running outside of Docker. The local bitcoind is not getting any rpc requests. |
f21e66e to
6cc76a3
Compare
|
@hulxv is it possible to directly attach the shell to the makerd logs just after the Maybe we can just run the logs command |
|
I want to add an argument to enter logs after start It will enter logs after start the services immediately. What do you think? |
|
b3f0b9d to
8924f77
Compare
mojoX911
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
tAck. tested all the paths and things seems to be working as expected. No major comment other than one change in the maker notice copy below.
mojoX911
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ack
1470fe0 to
a11b4ee
Compare
a11b4ee to
ea815da
Compare

Description
This PR refactors the Docker setup to be more robust, configurable, and "Docker-native" by removing the need for generating temporary configuration files.
Key Changes:
internal-bitcoind,internal-tor, andexternal-torprofiles to dynamically control which services are started based on the configuration.generate_compose_fileandgenerate_torrcfunctions from docker-setup. The setup now relies on a single, parameterized docker-compose.yml and environment variables.TOR_AUTH_PASSWORDwithout needing a pre-generated file.config.tomlat runtime based on environment variables.makerd-internalservice to handle thenetwork_mode: "service:tor"requirement specifically for the internal Tor profile, while keeping a standardmakerdservice for external Tor.healthcheckfor thebitcoindservice.setup_envfunction in docker-setup to centralize environment variable export and profile selection.start,stop, andlogscommands to use the standard docker-compose.yml with the correct environment context.Close #652