-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
docker-compose up #2699
docker-compose up #2699
Conversation
a1b78ee
to
3d9cffd
Compare
3d9cffd
to
1db9326
Compare
@yancyribbens might need a proper rebase? |
@cfromknecht I thought I did a proper rebase.. any idea why the diff between this branch and master is so... different? |
@yancyribbens it looks like a merge was applied instead of a rebase, judging by bfbe58b |
1db9326
to
e8bedf3
Compare
@cfromknecht think it was caused by a pull after rebase but before push. |
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.
Ran it, works great! Thank you for this feature.
To reduce the diff, could you have docker-compose.ltc.yml
inherit from docker-compose.yml
and then add the docker litecoin instructions as docker-compose -f docker-compose.yml -f docker-compose.ltc.yml up
(or something to that effect)?
@valentinewallace I removed the |
Successfully tested this on mainnet to make a small transaction. It took 4-5days to sync mainnet using BTCD on a dedicated machine with 8cores, 16gb of memory and a SSD drive. I think if this is merged the next thing would be to add the option to use bitcoind instead to improve performance. |
@yancyribbens: We had some changes to these files recently. Could you please rebase then I'm going to have a look. Thanks! |
@guggero sure i'll see if I can find some time this week to fix the merge conflicts. |
Needs rebase. |
94e8b01
to
0d70e66
Compare
@guggero done |
0d70e66
to
660b925
Compare
@guggero my bad. I should have test the changes better. I've updated with your suggestions and confirmed
Also, if we want the experience to be similar for both, I recommend updating the docker docs to add instructions for using LTC. #3808 |
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.
We're almost there!
There are some trailing spaces that should be removed. And it would be nice if you could squash everything together into two commits, maybe one for the README and one for the rest. And use the correct docker:
prefix in the commit messages.
docker/docker-compose.ltc.yml
Outdated
- lnd:/root/.lnd | ||
entrypoint: ["./start-lnd.sh"] | ||
links: | ||
- "ltcd:blockchain" |
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.
nit: there are a few trailing spaces on this line
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.
fixed
660b925
to
ebec6a2
Compare
@guggero I squashed the commits and prefixed |
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.
I tested the newest version and got some collisions. It would be nice if one could start both docker-compose.yml
and docker-compose.ltc.yml
at the same time.
docker/docker-compose.ltc.yml
Outdated
|
||
# lnd volume is used for persisting lnd application data and chain state | ||
# during container lifecycle. | ||
lnd: |
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.
To avoid collision with the other lnd, name this volume lnd_ltc
(change also in the volumes
section above).
ebec6a2
to
4eb0d44
Compare
@guggero agreed that would be ideal. I think there's more work todo then your comments to make this happen. For example, L58 of |
- shared:/rpc | ||
- lnd:/root/.lnd | ||
entrypoint: ["./start-lnd.sh"] | ||
links: |
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.
Should we remove links, which is deprecated?
Links are a legacy option. We recommend using networks instead.
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.
@johng removing the legacy issues could take place in a separate PR. I think there are enough changes in this PR and better to keep the PR simple and address the github issue imo.
I agree that more changes are necessary to get both bitcoin and litecoin running in parallel. In my opinion it's OK to postpone these changes (like switching to networks to get rid of the |
4eb0d44
to
1f457ac
Compare
@guggero the ltc lnd volume name has been updated. |
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.
Thanks, looks good to me!
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.
Looks good to me 🐳
Only comment is that I ran into a sneaky gotcha when testing some of the block generation commands. docker-compose up
only rebuilds if there is a change to the Dockerfile (which there isn't in this change), so the change to use localhost
in start-btcctl.sh
didn't update when I ran this the first time. Might be worth updating the readme to make a note of that?
Otherwise, awesome PR, glad this one is finally going to go in!
Also 😂 👏 |
@carlaKC thanks for testing out the changes. If I understand your comment, I think if you run |
Yeah, I ended up rebuilding the image and it was fine :) |
@carlaKC I think we can just add that warning/hint to the release notes where we describe the changes of this PR. Then we can merge it for |
Sure, sounds good to me! Happy to merge as is, it's just a small nit. |
https://i.gifer.com/52an.gif
#2509
build and start both
lnd
and thebtcd
backend with a single commanddocker-compose up
. In order to enable docker-compose to bring up the services, I removed service definitions that aren't needed for running the environment. The docs have been updated with new instructions for how to runbtcctl
now that it's not a separate service.Also, this PR Moves
ltc
to a separate docker-compose file. A future PR can allowltc
to be brought up with a single command and inherit fromdocker-compose.yml
.