From ba433a7199890a783faed27ff4b91caea73f5ca1 Mon Sep 17 00:00:00 2001 From: Frederico Araujo Date: Mon, 25 Jul 2022 20:05:02 -0400 Subject: [PATCH] fix(docker): revert to clang-9 on runtime image Signed-off-by: Frederico Araujo --- CHANGELOG.md | 14 +++++++++++++- Dockerfile.ubi.amd64 | 3 +++ README.md | 4 ++-- makefile.manifest.inc | 4 ++-- scripts/installUBIDependency.sh | 6 ++++-- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f918d0e1..29e42e40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ## [Unreleased] +## [0.4.4] - 2022-07-26 + +### Changed + +- Bumped UBI version to 8.6-855 + +### Fixed + +- Copies dkms to runtime image +- Revert clang version to clang-9 in docker image (eBPF prove is failing checks on clang-13) + ## [0.4.3] - 2022-06-21 ### Changed @@ -194,7 +205,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - First release candidate of SysFlow Collector. -[Unreleased]: https://github.com/sysflow-telemetry/sf-collector/compare/0.4.3...HEAD +[Unreleased]: https://github.com/sysflow-telemetry/sf-collector/compare/0.4.4...HEAD +[0.4.4]: https://github.com/sysflow-telemetry/sf-collector/compare/0.4.3...0.4.4 [0.4.3]: https://github.com/sysflow-telemetry/sf-collector/compare/0.4.2...0.4.3 [0.4.2]: https://github.com/sysflow-telemetry/sf-collector/compare/0.4.1...0.4.2 [0.4.1]: https://github.com/sysflow-telemetry/sf-collector/compare/0.4.0...0.4.1 diff --git a/Dockerfile.ubi.amd64 b/Dockerfile.ubi.amd64 index 8102bde0..9f1dfef5 100644 --- a/Dockerfile.ubi.amd64 +++ b/Dockerfile.ubi.amd64 @@ -43,6 +43,9 @@ ARG UBI_VER FROM registry.access.redhat.com/ubi8/ubi:${UBI_VER} AS base # Install Packages +# Copy in llvm 9.0 rpms. Sysdig's ebpf probe fails unless compiled with llvm 9.0 for now. +# https://github.com/falcosecurity/libs/issues/4 +COPY ./scripts/dev/rpms /build/rpms COPY ./scripts/installUBIDependency.sh /build/install.sh RUN --mount=type=secret,id=rhuser --mount=type=secret,id=rhpassword \ diff --git a/README.md b/README.md index 699956da..9d4ce118 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ # Supported tags and respective `Dockerfile` links -- [`0.4.3`, `latest`](https://github.com/sysflow-telemetry/sf-collector/blob/0.4.3/Dockerfile), [`edge`](https://github.com/sysflow-telemetry/sf-collector/blob/master/Dockerfile), [`dev`](https://github.com/sysflow-telemetry/sf-collector/blob/dev/Dockerfile) +- [`0.4.4`, `latest`](https://github.com/sysflow-telemetry/sf-collector/blob/0.4.4/Dockerfile), [`edge`](https://github.com/sysflow-telemetry/sf-collector/blob/master/Dockerfile), [`dev`](https://github.com/sysflow-telemetry/sf-collector/blob/dev/Dockerfile) # Quick reference @@ -26,7 +26,7 @@ [docker hub](https://hub.docker.com/u/sysflowtelemetry) | [GHCR](https://github.com/orgs/sysflow-telemetry/packages) - **Binary packages**: - [deb](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.4.3/sfcollector-0.4.3-x86_64.deb) | [rpm](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.4.3/sfcollector-0.4.3-x86_64.rpm) | [tgz](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.4.3/sfcollector-0.4.3-x86_64.tar.gz) + [deb](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.4.4/sfcollector-0.4.4-x86_64.deb) | [rpm](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.4.4/sfcollector-0.4.4-x86_64.rpm) | [tgz](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.4.4/sfcollector-0.4.4-x86_64.tar.gz) # What is SysFlow? diff --git a/makefile.manifest.inc b/makefile.manifest.inc index 20d50fc0..4be5b561 100644 --- a/makefile.manifest.inc +++ b/makefile.manifest.inc @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SYSFLOW_VERSION?=0.4.3 +SYSFLOW_VERSION?=0.4.4 SYSFLOW_BUILD_NUMBER?=1 FALCO_VERSION=7750b6f FALCO_LIBS_VERSION=319368f1ad778691164d33d59945e00c5752cd27 @@ -28,4 +28,4 @@ ELFUTILS_VERSION=elfutils-0.173 GLOG_VERSION=v0.5.0 SNAPPY_VERSION=1.1.9 DKMS_VERSION=v3.0.3 -UBI_VERSION=8.6-754 +UBI_VERSION=8.6-855 diff --git a/scripts/installUBIDependency.sh b/scripts/installUBIDependency.sh index 9f6f044e..e6b10272 100755 --- a/scripts/installUBIDependency.sh +++ b/scripts/installUBIDependency.sh @@ -89,10 +89,12 @@ if [ "${MODE}" == "base" ] ; then libstdc++-static \ boost-static \ sparsehash-devel \ - bc \ - llvm-toolset \ + bc && dnf -y clean all ; rm -rf /var/cache/{dnf,yum} +# Install llvm 9 +DIR=$(pwd) && cd /build/rpms/llvm && ./install.sh && cd $DIR + elif [ "${MODE}" == "test-extra" ] ; then # additional packages for testing