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

CCAAS Builders #3315

Merged
merged 1 commit into from
Jul 29, 2022
Merged

CCAAS Builders #3315

merged 1 commit into from
Jul 29, 2022

Conversation

mbwhite
Copy link
Member

@mbwhite mbwhite commented Mar 31, 2022

  • adjust the makefile to have targets for linux-amd64/darwin-amd64/windows-amd64
  • adjust the packaging as suggested in issue 3286

Signed-off-by: Matthew B White whitemat@uk.ibm.com

Type of change

  • Bug fix
  • New feature
  • Improvement (improvement to code, performance, etc)
  • Test update
  • Documentation update

Description

Additional details

Related issues

@mbwhite mbwhite requested a review from a team as a code owner March 31, 2022 16:10
@mbwhite
Copy link
Member Author

mbwhite commented Mar 31, 2022

resolves issue #3286

jt-nti
jt-nti previously approved these changes Mar 31, 2022
@denyeart
Copy link
Contributor

/ci-run

@denyeart
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mbwhite mbwhite force-pushed the builder-packaging-redux branch 4 times, most recently from 4b9d638 to 2a4bf8e Compare July 27, 2022 12:24
@mbwhite
Copy link
Member Author

mbwhite commented Jul 27, 2022

@denyeart this is good for review :-)

@@ -18,5 +18,7 @@ if [ "$(jq -r .type "$META/metadata.json")" == "binary" ]; then
exit 0
fi

>&2 cat $META/metadata.json
Copy link
Member

Choose a reason for hiding this comment

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

Did you mean to leave this in?

Copy link
Member Author

Choose a reason for hiding this comment

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

well I didn't but then it was useful in debugging - as later on the peer lies about what the language really is.
(i.e. it toUpperCase() the language - so I first assumed the packaging of the contract was wrong

- adjust the makefile to have targets for linux-amd64/darwin-amd64/windows-amd64
- adjust the packaging as suggested in issue 3286

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
@denyeart denyeart merged commit 704487f into hyperledger:main Jul 29, 2022
@denyeart
Copy link
Contributor

@Mergifyio backport release-2.5

@denyeart
Copy link
Contributor

@Mergifyio backport release-2.4

@mergify
Copy link

mergify bot commented Jul 29, 2022

backport release-2.5

✅ Backports have been created

@mergify
Copy link

mergify bot commented Jul 29, 2022

backport release-2.4

✅ Backports have been created

C0rWin added a commit to C0rWin/fabric that referenced this pull request Jul 31, 2022
After hyperledger#3315 was merged, the -buildvcs=false flag was mistakenly removed,
this commit fixes the change and adds it back.

Signed-off-by: Artem Barger <artem@bargr.net>
yacovm pushed a commit that referenced this pull request Aug 1, 2022
After #3315 was merged, the -buildvcs=false flag was mistakenly removed,
this commit fixes the change and adds it back.

Signed-off-by: Artem Barger <artem@bargr.net>
mergify bot pushed a commit that referenced this pull request Aug 1, 2022
After #3315 was merged, the -buildvcs=false flag was mistakenly removed,
this commit fixes the change and adds it back.

Signed-off-by: Artem Barger <artem@bargr.net>
(cherry picked from commit dcaf2b2)
mergify bot pushed a commit that referenced this pull request Aug 1, 2022
After #3315 was merged, the -buildvcs=false flag was mistakenly removed,
this commit fixes the change and adds it back.

Signed-off-by: Artem Barger <artem@bargr.net>
(cherry picked from commit dcaf2b2)
denyeart pushed a commit that referenced this pull request Aug 1, 2022
After #3315 was merged, the -buildvcs=false flag was mistakenly removed,
this commit fixes the change and adds it back.

Signed-off-by: Artem Barger <artem@bargr.net>
(cherry picked from commit dcaf2b2)
denyeart pushed a commit that referenced this pull request Aug 1, 2022
After #3315 was merged, the -buildvcs=false flag was mistakenly removed,
this commit fixes the change and adds it back.

Signed-off-by: Artem Barger <artem@bargr.net>
(cherry picked from commit dcaf2b2)
yacovm pushed a commit that referenced this pull request Aug 1, 2022
* Add -buildvcs=false for ccaasbuilder

After #3315 was merged, the -buildvcs=false flag was mistakenly removed,
this commit fixes the change and adds it back.

Signed-off-by: Artem Barger <artem@bargr.net>

* Enable compilation on linux/arm64 platforms

While building the peer docker image the location of the ccaasbuilder
binaries was hardcoded into the Dockerfile, though the output directory
is platform dependent. Therefore this commit suggest two changes:

1. Prepare binary location based on the architecture and copy them into
   the temporal location, hence it will become possible to generalize
   file location inside Dockerfile

2. Suggest static binaries compilation, to include all dependent
   libraries in compile time, turns out there are different set of
   libraries between alpine:${ALPINE_VER} and
   golang:${GO_VER}-alpine${ALPINE_VER} docker images which cause peer
   to segfault on ARM64 based platforms.

Signed-off-by: Artem Barger <artem@bargr.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants