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.

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

new(docker): add cmake and git packages to builders images. #309

Merged
merged 1 commit into from
Dec 12, 2023
Merged

new(docker): add cmake and git packages to builders images. #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions docker/builders/builder-any-x86_64_gcc10.0.0_gcc9.0.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ RUN apt-get update \
software-properties-common \
gpg \
zstd \
&& rm -rf /var/lib/apt/lists/*
cmake \
git \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need git too.
We will run cmake configuration step in full mode, even if with lots of things disabled. Unfortunately, given that libs only recently gained the ability to build the bpf probe in MINIMAL_BUILD mode, we need to configure the project in full mode, and this requires git because grpc and protobuf deps need to be fetched/cloned.

&& rm -rf /var/lib/apt/lists/*

# Properly create soft link
RUN ln -s /usr/bin/gcc-9 /usr/bin/gcc-9.0.0
RUN ln -s /usr/bin/gcc-10 /usr/bin/gcc-10.0.0
RUN ln -s /usr/bin/gcc-10 /usr/bin/gcc-10.0.0
4 changes: 3 additions & 1 deletion docker/builders/builder-any-x86_64_gcc12.0.0_gcc11.0.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ RUN apt-get update \
software-properties-common \
gpg \
zstd \
&& rm -rf /var/lib/apt/lists/*
cmake \
git \
&& rm -rf /var/lib/apt/lists/*

# Properly create soft links
RUN ln -s /usr/bin/gcc-11 /usr/bin/gcc-11.0.0
Expand Down
4 changes: 3 additions & 1 deletion docker/builders/builder-any-x86_64_gcc8.0.0_gcc6.0.0_gcc5.0.0_gcc4.9.0_gcc4.8.0.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ RUN apt-get update \
zstd \
gawk \
mawk \
&& rm -rf /var/lib/apt/lists/*
cmake \
git \
&& rm -rf /var/lib/apt/lists/*

RUN if [ "$TARGETARCH" = "amd64" ] ; then apt-get install -y --no-install-recommends libmpx2; fi

Expand Down
10 changes: 9 additions & 1 deletion docker/builders/builder-centos-x86_64_gcc4.8.5.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,15 @@ RUN yum -y install centos-release-scl && \
wget \
binutils \
which \
make
make \
git

# Install cmake3.x (on centos7 `cmake` package installs cmake2.x)
RUN curl -L -o /tmp/cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-linux-$(uname -m).tar.gz; \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need to manually install a cmake 3.x on centos:7.

gzip -d /tmp/cmake.tar.gz; \
tar -xpf /tmp/cmake.tar --directory=/tmp; \
cp -R /tmp/cmake-3.22.5-linux-$(uname -m)/* /usr; \
rm -rf /tmp/cmake-3.22.5-linux-$(uname -m)/

# Properly create soft link
RUN ln -s /usr/bin/gcc /usr/bin/gcc-4.8.5
Expand Down