Skip to content

Commit

Permalink
upgrade to ruby 3.3 and alpine 3.19
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Wilcsinszky <[email protected]>
  • Loading branch information
pepov authored and rafaelpissolatto committed Jan 4, 2024
1 parent 8b2f587 commit 4d5e4c8
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions v1.16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo

# Adapted from https://github.com/SumoLogic/sumologic-kubernetes-fluentd/blob/main/alpine.Dockerfile#L102C1-L142C16
FROM ruby:3.2.2-alpine3.18 as base
FROM ruby:3.3.0-alpine3.19 as base

ARG BUILD_DEPS=" \
make gcc g++ libc-dev \
Expand All @@ -27,8 +27,6 @@ RUN apk add --no-cache \
tini libmaxminddb geoip \
snappy \
&& apk add --no-cache $BUILD_DEPS \
&& apk add --no-cache "libssl3>=3.1.4-r1" \
&& apk add --no-cache "libcrypto3>=3.1.4-r1" \
&& echo 'gem: --no-document' >> /etc/gemrc \
# need to rebuild these gems to have the extensions installed
&& fluent-gem install \
Expand All @@ -42,8 +40,6 @@ RUN apk add --no-cache \
&& fluent-gem install specific_install -v 0.3.8 \
&& fluent-gem specific_install -l https://github.com/ManageIQ/kubeclient.git --ref 054bff2c5e31a555004be2b3c4d32fb9dc5e6a0f \
&& fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
# TODO remove once the default version is greater than 0.12.1 https://avd.aquasec.com/nvd/2023/cve-2023-36617/
&& fluent-gem install uri -v 0.12.2 \
&& find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \
&& apk del $BUILD_DEPS \
&& rm -rf /usr/local/bundle/cache/* && find /usr/local/bundle -name '*.o' -delete
Expand Down

0 comments on commit 4d5e4c8

Please sign in to comment.