Skip to content

Commit

Permalink
Regenerate windows toolchains from f07adf6
Browse files Browse the repository at this point in the history
  [skip ci]
  Regenerate linux toolchains from 3f6b1b0

  [skip ci]
  fix: script and dockerfile for centos (#154)

* fix: script and dockerfile for centos

- gn has to be compiled to satisfy centos glibc requirements and
  to mitigate problems with the version of envoy's wasm/v8
  dependency (ref: envoyproxy/envoy#15119)
- prependend PATH env var in centos' dockerfile by /usr/local/bin
  which was missing before and which is path where bazel is present
  (ref: envoyproxy/envoy/#12535)
- added installation of glibc-static and libstdc++-static

ref: envoyproxy/envoy#18365

Signed-off-by: Bart Smykla <bartek@smykla.com>

* boringssl/fips: move gn building down

as it expects to have llvm+clang installed to compile

Signed-off-by: Bart Smykla <bartek@smykla.com>

* remove unnecessary whitespace changes

Signed-off-by: Bart Smykla <bartek@smykla.com>

* centos: remove unnecessary PATH alteration

it's actually unnecessary as it's already included and the problem
was not with the order, but with PATH not being preserved, when
run `run_envoy_docker.sh` script from envoyproxy/envoy/ci

Signed-off-by: Bart Smykla <bartek@smykla.com>

* move PATH from container to build_container_centos

As the PATH is not preserved from environment in some of the CI
scripts, we have to use it like in ubuntu scripts, which means
to just move the PATH wrom dockerfile to the script

Signed-off-by: Bart Smykla <bartek@smykla.com>

* Revert "move PATH from container to build_container_centos"

This reverts commit 46d091c.

Signed-off-by: Bart Smykla <bartek@smykla.com>

* move centos PATH to /etc/profile.d file

Signed-off-by: Bart Smykla <bartek@smykla.com>

* source profile in build_container_centos.sh

As when building container we also need updated PATH, I'm sourcing
/etc/profile.d/profile_centos.sh at the beginning of the script

Signed-off-by: Bart Smykla <bartek@smykla.com>

* modify path in sudoers

Signed-off-by: Bart Smykla <bartek@smykla.com>

* remove duplication

Signed-off-by: Bart Smykla <bartek@smykla.com>
  • Loading branch information
envoy-build-tools(Azure Pipelines) committed Feb 16, 2022
1 parent f07adf6 commit 074db89
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion toolchains/configs/windows/clang-cl/config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ platform(
"@bazel_tools//platforms:x86_64",
],
exec_properties = {
"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:4bf7d146146bee6ba5924a0bf9071b939eec52c26350732816078c71b8541948",
"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:cb9b9842a52d5b7a47d90cdf1a030ddf7d0d38ae87fb411eaf1ffb580ca22845",
"OSFamily": "Windows",
},
)
2 changes: 1 addition & 1 deletion toolchains/configs/windows/msvc-cl/config/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ platform(
"@bazel_tools//platforms:x86_64",
],
exec_properties = {
"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:4bf7d146146bee6ba5924a0bf9071b939eec52c26350732816078c71b8541948",
"container-image": "docker://gcr.io/envoy-ci/envoy-build-windows@sha256:cb9b9842a52d5b7a47d90cdf1a030ddf7d0d38ae87fb411eaf1ffb580ca22845",
"OSFamily": "Windows",
},
)

0 comments on commit 074db89

Please sign in to comment.