Skip to content

build: Fix that custom docker image build#12564

Merged
lizan merged 2 commits intoenvoyproxy:masterfrom
chadr123:fix_custom_build_for_dev
Aug 11, 2020
Merged

build: Fix that custom docker image build#12564
lizan merged 2 commits intoenvoyproxy:masterfrom
chadr123:fix_custom_build_for_dev

Conversation

@chadr123
Copy link
Contributor

Commit Message:
The do_ci.sh builds the envoy and copies binary to under build-* directories.
But recently, the arm64 build system was added but it does not consider the
previous custom docker image build.
It is very useful to build the custom docker image and test it within k8s environment.

So, this patch support previous behavior again so that we can build the custom docker image.
If some more cpu architectures are added, we can simple extends more cpu architectures.

Signed-off-by: DongRyeol Cha dr83.cha@samsung.com
Additional Description: None
Risk Level: Low
Testing: bazel test and bazel build
Docs Changes: None
Release Notes: None

The do_ci.sh builds the envoy and copies binary to under build-* directories.
But recently, the arm64 build system was added but it does not consider the
previous custom docker image build.
It is very useful to build the custom docker image and test it within k8s environment.

So, this patch support previous behavior again so that we can build the custom docker image.
If some more cpu architectures are added, we can simple extends more cpu architectures.

Signed-off-by: DongRyeol Cha <dr83.cha@samsung.com>
Copy link
Member

Choose a reason for hiding this comment

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

style: use "$(uname -m)"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok. :)

ci/do_ci.sh Outdated
Comment on lines 23 to 25
Copy link
Member

Choose a reason for hiding this comment

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

There are folks building on ppc64le / s390x, Shouldn't fail hard here. Just fall back to linux/${ENVOY_BUILD_ARCH}?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

NP. I will revise my patch.

Signed-off-by: DongRyeol Cha <dr83.cha@samsung.com>
@chadr123 chadr123 force-pushed the fix_custom_build_for_dev branch from 7d9a265 to ac84bdd Compare August 11, 2020 05:02
@chadr123
Copy link
Contributor Author

I have changed my patch. Please check it. :)

@chadr123 chadr123 requested a review from lizan August 11, 2020 05:28
@lizan lizan merged commit 887637c into envoyproxy:master Aug 11, 2020
@chadr123 chadr123 deleted the fix_custom_build_for_dev branch August 11, 2020 07:56
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.

2 participants