Skip to content

fix: script and dockerfile for centos #154

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.

Sign up for GitHub

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

Merged
phlax merged 11 commits into from
Feb 16, 2022
Merged

fix: script and dockerfile for centos #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
93364f1
fix: script and dockerfile for centos
bartsmykla Oct 5, 2021
ec7fe3d
boringssl/fips: move gn building down
bartsmykla Oct 5, 2021
681a28e
remove unnecessary whitespace changes
bartsmykla Oct 6, 2021
46e90b1
centos: remove unnecessary PATH alteration
bartsmykla Oct 6, 2021
46d091c
move PATH from container to build_container_centos
bartsmykla Oct 7, 2021
b32c699
Revert "move PATH from container to build_container_centos"
bartsmykla Oct 7, 2021
974f996
move centos PATH to /etc/profile.d file
bartsmykla Oct 7, 2021
e43b1a7
source profile in build_container_centos.sh
bartsmykla Oct 7, 2021
c082f20
modify path in sudoers
bartsmykla Oct 8, 2021
ca7f67d
remove duplication
bartsmykla Oct 8, 2021
2d82a56
Merge branch 'main' into fix-centos-buids
bartsmykla Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build_container/Dockerfile-centos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ COPY ./build_container_common.sh /
COPY ./build_container_centos.sh /

ENV PATH /opt/rh/rh-git218/root/usr/bin:/opt/rh/devtoolset-7/root/usr/bin:/opt/llvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

RUN mkdir /etc/sudoers.d
RUN echo "Defaults secure_path = $PATH" > /etc/sudoers.d/path

RUN ./build_container_centos.sh
ENV LC_ALL en_US.UTF-8

Expand Down
19 changes: 18 additions & 1 deletion build_container/build_container_centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fi
yum update -y
yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++ devtoolset-9-binutils java-1.8.0-openjdk-headless jq rsync \
rh-git218 wget unzip which make cmake3 patch ninja-build devtoolset-9-libatomic-devel openssl python27 \
libtool autoconf tcpdump graphviz doxygen sudo
libtool autoconf tcpdump graphviz doxygen sudo glibc-static libstdc++-static

# set locale
localedef -c -f UTF-8 -i en_US en_US.UTF-8
Expand Down Expand Up @@ -54,4 +54,21 @@ fi

source ./build_container_common.sh

# compile proper version of gn, compatible with CentOS's GLIBC version and
# envoy wasm/v8 dependency
# can be removed when the dependency will be updated
git clone https://gn.googlesource.com/gn
pushd gn
# 45aa842fb41d79e149b46fac8ad71728856e15b9 is a hash of the version
# before https://gn.googlesource.com/gn/+/46b572ce4ceedfe57f4f84051bd7da624c98bf01
# as this commit expects envoy to rely on newer version of wasm/v8 with the fix
# from https://github.com/v8/v8/commit/eac21d572e92a82f5656379bc90f8ecf1ff884fc
# (versions 9.5.164 - 9.6.152)
git checkout 45aa842fb41d79e149b46fac8ad71728856e15b9
python build/gen.py
ninja -C out
mv -f out/gn /usr/local/bin/gn
chmod +x /usr/local/bin/gn
popd

yum clean all