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

build(docker-compose): upgrade to docker compose V2 #2596

Merged

Conversation

outSH
Copy link
Contributor

@outSH outSH commented Aug 4, 2023

  • quorum-multi-party-all-in-one: use newest quorum-quorum-dev-quickstart, update quorum versions to most recent available. Run ledger as quorum user (required by newer versions). Use docker compose V2 from alpine package registry instead of V1 from pip.
  • besu-multi-party-all-in-one: similar changes as for quorum-multi-party-all-in-on. Fix broken besu private transaction tests.
  • fabric-all-in-one: Use docker compose V2 from alpine package registry instead of V1 from pip.
  • sawtooth-all-in-one: Use docker compose V2 from alpine package registry instead of V1 from pip.

Closes: #2593
Closes: #2557

@outSH
Copy link
Contributor Author

outSH commented Aug 4, 2023

@petermetz I've tested fabric and sawtooth images by running our example apps (discounted asset trade and electricity trade). For quorum and besu I've used newly build images with our functional tests and all pases.

In particular, new image solves https://github.com/hyperledger/cacti/issues/2557 so please push the besu image from this branch to hyperledger ghcr so I can fix them right away :)

Copy link
Contributor

@jagpreetsinghsasan jagpreetsinghsasan left a comment

Choose a reason for hiding this comment

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

Informative in-code comments, LGTM. Thankyou for the PR

outSH added a commit to outSH/cactus that referenced this pull request Aug 7, 2023
- Update indy validator python dependencies.
- Add README chapter on updating python dependencies to simplify this process in the future.
- Use pinend ubuntu base image in indy-sdk-cli dockerfile.
- Do some minor README improvements and cleanups.

Tested with `discounted-asset-trade` (should work without an issue now, at least dockerless one)

Depends on: hyperledger-cacti#2596

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
Copy link
Contributor

@izuru0 izuru0 left a comment

Choose a reason for hiding this comment

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

LGTM

@outSH
Copy link
Contributor Author

outSH commented Aug 8, 2023

Don't merge until besu image is released to ghcr

@petermetz petermetz self-assigned this Aug 9, 2023
Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@outSH Thank you very much for the fixes!
I just pushed the besu mp image as ghcr.io/hyperledger/cactus-besu-all-in-one-multi-party:2023-08-08-pr-2596 please update the code with it and send it back for review!

- `quorum-multi-party-all-in-one`: use newest `quorum-quorum-dev-quickstart`,
    update quorum versions to most recent available. Run ledger as `quorum` user
    (required by newer versions). Use docker compose V2 from alpine package registry instead of
    V1 from pip.
- `besu-multi-party-all-in-one`: similar changes as for quorum-multi-party-all-in-on.
    Fix broken besu private transaction tests.
- `fabric-all-in-one`: Use docker compose V2 from alpine package registry instead of V1 from pip.
- `sawtooth-all-in-one`: Use docker compose V2 from alpine package registry instead of V1 from pip.

Closes: hyperledger-cacti#2593
Closes: hyperledger-cacti#2557

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
@outSH outSH force-pushed the update_to_docker_compose_v2_pr branch from a028aa0 to f520b18 Compare August 9, 2023 10:34
@outSH
Copy link
Contributor Author

outSH commented Aug 9, 2023

I just pushed the besu mp image as ghcr.io/hyperledger/cactus-besu-all-in-one-multi-party:2023-08-08-pr-2596

@petermetz Thanks! I've updated the test files, please review.

@outSH outSH requested a review from petermetz August 9, 2023 10:38
Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@outSH Thank you very much! Looks great!

Please take a look at my concurrent PR [1] that also changes the tools/docker/fabric-all-in-one/Dockerfile_v2.x container image file to make sure I didn't destroy any of your intended changes that you made in this PR (I'll make sure that yours go in first because you opened it first).

  1. I had a slightly different approach to fixing the openssh version conflicts, I'll just go with your solution on that.
  2. I didn't close any of the ports that were exposed - is that something that you wanted to keep (and if yes why?)

[1] https://github.com/hyperledger/cacti/pull/2599

@petermetz petermetz enabled auto-merge (rebase) August 10, 2023 16:28
@petermetz petermetz merged commit d84fcd5 into hyperledger-cacti:main Aug 10, 2023
outSH added a commit to outSH/cactus that referenced this pull request Aug 29, 2023
- Update indy validator python dependencies.
- Add README chapter on updating python dependencies to simplify this process in the future.
- Use pinend ubuntu base image in indy-sdk-cli dockerfile.
- Do some minor README improvements and cleanups.
- Use pinned fabric-all-in-one versions in discounted-asset-trade.

Tested with `discounted-asset-trade` (should work without an issue now, at least dockerless one)

Depends on: hyperledger-cacti#2596

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
outSH added a commit to outSH/cactus that referenced this pull request Sep 11, 2023
- Update indy validator python dependencies.
- Add README chapter on updating python dependencies to simplify this process in the future.
- Use pinend ubuntu base image in indy-sdk-cli dockerfile.
- Do some minor README improvements and cleanups.
- Use pinned fabric-all-in-one versions in discounted-asset-trade.

Tested with `discounted-asset-trade` (should work without an issue now, at least dockerless one)

Depends on: hyperledger-cacti#2596

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
outSH added a commit to outSH/cactus that referenced this pull request Sep 11, 2023
- Update indy validator python dependencies.
- Add README chapter on updating python dependencies to simplify this process in the future.
- Use pinend ubuntu base image in indy-sdk-cli dockerfile.
- Do some minor README improvements and cleanups.
- Use pinned fabric-all-in-one versions in discounted-asset-trade.

Tested with `discounted-asset-trade` (should work without an issue now, at least dockerless one)

Depends on: hyperledger-cacti#2596

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
petermetz pushed a commit to outSH/cactus that referenced this pull request Sep 18, 2023
- Update indy validator python dependencies.
- Add README chapter on updating python dependencies to simplify this process in the future.
- Use pinend ubuntu base image in indy-sdk-cli dockerfile.
- Do some minor README improvements and cleanups.
- Use pinned fabric-all-in-one versions in discounted-asset-trade.

Tested with `discounted-asset-trade` (should work without an issue now, at least dockerless one)

Depends on: hyperledger-cacti#2596

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
sandeepnRES pushed a commit to sandeepnRES/cacti that referenced this pull request Dec 21, 2023
- Update indy validator python dependencies.
- Add README chapter on updating python dependencies to simplify this process in the future.
- Use pinend ubuntu base image in indy-sdk-cli dockerfile.
- Do some minor README improvements and cleanups.
- Use pinned fabric-all-in-one versions in discounted-asset-trade.

Tested with `discounted-asset-trade` (should work without an issue now, at least dockerless one)

Depends on: hyperledger-cacti#2596

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants