Skip to content

3.1.32 CVE fixes #1596

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
suyadav1 merged 9 commits into from
Jan 14, 2026
Merged

3.1.32 CVE fixes #1596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b485ae
Upgrade Telegraf and Fluent-bit
suyadav1 Jan 6, 2026
f1fb1a2
re-install uri
suyadav1 Jan 6, 2026
2e42ea9
uninstall uri
suyadav1 Jan 6, 2026
87d8136
Remove uri files
suyadav1 Jan 6, 2026
aa9c236
gem install uri
suyadav1 Jan 7, 2026
b89cc2b
Upgrade ruby
suyadav1 Jan 8, 2026
1762248
remove trivy
suyadav1 Jan 8, 2026
e04a0ad
ruby 4.0
suyadav1 Jan 8, 2026
13eeb82
Telegraf mariner package
suyadav1 Jan 10, 2026
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
31 changes: 0 additions & 31 deletions kubernetes/linux/Dockerfile.multiarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,35 +141,4 @@ COPY --from=builder /lib/pkcs11/p11-kit-trust.so /lib/pkcs11/
RUN ln -s /lib/pkcs11/p11-kit-trust.so /lib/libnssckbi.so
RUN ln -s /lib/libnssckbi.so /lib/p11-kit-trust.so

# Do vulnerability scan in a seperate stage to avoid adding layer
FROM distroless_image AS vulnscan
COPY .trivyignore .trivyignore
RUN ["/bin/bash", "-c", "curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.39.0"]

# Set up primary and secondary repository URLs
ENV PRIMARY_TRIVY_DB_REPOSITORY="ghcr.io/aquasecurity/trivy-db"
ENV SECONDARY_TRIVY_DB_REPOSITORY="public.ecr.aws/aquasecurity/trivy-db"

# Download Trivy main database with a fallback mechanism
RUN export TRIVY_DB_REPOSITORY=$PRIMARY_TRIVY_DB_REPOSITORY && \
trivy image --download-db-only || \
(echo "Primary TRIVY_DB_REPOSITORY failed, trying secondary." && \
export TRIVY_DB_REPOSITORY=$SECONDARY_TRIVY_DB_REPOSITORY && \
trivy image --download-db-only) || \
(echo "Both TRIVY_DB_REPOSITORY sources failed." && exit 1)

# Perform Trivy rootfs scan (only OS vulnerabilities, no Java scanning)
RUN ["/bin/bash", "-c", "trivy rootfs --ignore-unfixed --no-progress --severity HIGH,CRITICAL,MEDIUM --vuln-type os --scanners vuln --skip-files \"/usr/local/bin/trivy\" /"]
RUN ["/bin/bash", "-c", "trivy rootfs --ignore-unfixed --no-progress --severity HIGH,CRITICAL,MEDIUM --vuln-type os --scanners vuln /usr/lib"]
RUN ["/bin/bash", "-c", "trivy rootfs --exit-code 1 --ignore-unfixed --no-progress --severity HIGH,CRITICAL,MEDIUM --vuln-type os --scanners vuln --skip-files \"/usr/local/bin/trivy\" / > /dev/null 2>&1 && trivy rootfs --exit-code 1 --ignore-unfixed --no-progress --severity HIGH,CRITICAL,MEDIUM --vuln-type os --scanners vuln /usr/lib > /dev/null 2>&1"]

# Revert to base layer before vulnscan
FROM distroless_image AS ContainerInsights
# force the trivy stage to run
# docker buildx (BUILDKIT) does not build stages which do not affect the final stage
# by copying over a file we create a dependency
# see: https://github.com/docker/build-push-action/issues/377
COPY --from=vulnscan /usr/local/bin/trivy /usr/local/bin/trivy
RUN ["/bin/bash", "-c", "rm -rf /usr/local/bin/trivy"]

CMD [ "/opt/main.sh" ]
4 changes: 2 additions & 2 deletions kubernetes/linux/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ sudo tdnf install jq-1.7.1-1.azl3 -y
#used to setcaps for ruby process to read /proc/env
sudo tdnf install libcap -y

sudo tdnf install telegraf-agent-1.36.4 -y
sudo tdnf install telegraf-agent-1.37.0 -y
telegraf_version=$(sudo tdnf list installed | grep telegraf | awk '{print $2}')
echo "telegraf $telegraf_version" >> packages_version.txt
mv /usr/bin/telegraf-agent /opt/telegraf
Expand All @@ -73,7 +73,7 @@ docker_cimprov_version=$(sudo tdnf list installed | grep docker-cimprov | awk '{
echo "DOCKER_CIMPROV_VERSION=$docker_cimprov_version" >> packages_version.txt

#install fluent-bit
sudo tdnf install azcu-fluent-bit-4.0.9 -y
sudo tdnf install azcu-fluent-bit-4.1.1 -y
echo "$(fluent-bit --version)" >> packages_version.txt

# install fluentd
Expand Down
Loading