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

Jump to bottom

chore(deps) update v1.16 to ruby 3.2.3 and revert unnecessary changes in 3.3 by downgrading to previous base and alpine 3.18 #116

Merged
merged 1 commit into from
Jan 31, 2024
Merged

chore(deps) update v1.16 to ruby 3.2.3 and revert unnecessary changes in 3.3 by downgrading to previous base and alpine 3.18 #116

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
8 changes: 5 additions & 3 deletions v1.16-ruby3.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# https://github.com/SumoLogic/sumologic-kubernetes-fluentd/blob/main/alpine.Dockerfile
# TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file)
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:835c033c582cd562ec786951cd84c6c4f081285231842286500fda273c8d8a73 AS sumo
FROM public.ecr.aws/sumologic/kubernetes-fluentd:latest-alpine@sha256:b44e3526ae59b558576de5695aa5d6b1bdd4e0a080372f0f25d77a4d2092a476 AS sumo

FROM ruby:3.3.0-alpine3.19 as base
FROM ruby:3.3.0-alpine3.18 as base

ARG BUILD_DEPS=" \
make gcc g++ libc-dev \
Expand All @@ -28,6 +28,8 @@ 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 \

# BASEIMAGEDEPS
Expand All @@ -37,7 +39,7 @@ RUN apk add --no-cache \
oj:3.15.0 \
google-protobuf:3.21.12 \
nio4r:2.6.0 \
snappy:0.4.0 \
snappy:0.3.0 \
# The only required fluentd dependency is the label router
# kubeclient install is upgrading the one from the base image
&& fluent-gem install specific_install -v 0.3.8 \
Expand Down
5 changes: 1 addition & 4 deletions v1.16/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# TODO every time the base image is changed please make sure BASEIMAGEDEPS is updated (further down in this file)
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.2.3-alpine3.18 as base

ARG BUILD_DEPS=" \
make gcc g++ libc-dev \
Expand Down Expand Up @@ -45,8 +44,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