Skip to content

Commit

Permalink
fix: update ruby to 2.7.6 (#319)
Browse files Browse the repository at this point in the history
- update ruby to 2.7.6
- update cgi to 0.1.1
- remove unneeded cache files

Signed-off-by: Brian Davis <dbrian@vmware.com>

Co-authored-by: Brian Davis <dbrian@vmware.com>
  • Loading branch information
slimm609 and slimm609 authored Apr 27, 2022
1 parent d74473b commit d737ce9
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kube-fluentd-operator

Copyright 2018 VMware, Inc. All rights reserved
Copyright 2022 VMware, Inc. All rights reserved

The BSD-2 license (the ìLicenseî) set forth below applies to all parts of the kube-fluentd-operator
project. You may not use this file except in compliance with the License.†
Expand Down
9 changes: 6 additions & 3 deletions base-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Similar to https://github.com/drecom/docker-centos-ruby/blob/2.6.5-slim/Dockerfile

ARG RVM_PATH=/usr/local/rvm
ARG RUBY_VERSION=ruby-2.7.5
ARG RUBY_VERSION=ruby-2.7.6
ARG RUBY_PATH=/usr/local/rvm/rubies/$RUBY_VERSION
ARG RUBYOPT='-W:no-deprecated -W:no-experimental'

Expand Down Expand Up @@ -58,6 +58,7 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import \
&& rvm install --disable-binary $RUBY_VERSION --default \
&& gem update --system --no-document \
&& gem install bundler -v '>= 2.3.4' --default --no-document \
&& gem install cgi -v '>= 0.1.1' --default --no-document \
&& gem install rexml -v '>= 3.2.5' --default --no-document \
&& gem install json -v '>= 2.6.1' --default --no-document \
&& gem install webrick -v '>= 1.7.0' --default --no-document \
Expand All @@ -69,7 +70,8 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import \
&& rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/json-2.3.0.gemspec \
&& rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/json-2.5.1.gemspec \
&& rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/webrick-1.6.1.gemspec \
&& rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/date-3.0.3.gemspec
&& rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/date-3.0.3.gemspec \
&& rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/cgi-0.1.0.1.gemspec

FROM photon:3.0
ARG RUBY_PATH
Expand Down Expand Up @@ -150,7 +152,8 @@ RUN mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins /usr/local/bundle/bin/ \
&& ln -s $(which fluentd) /usr/local/bundle/bin/fluentd \
&& tdnf remove -y $buildDeps \
&& tdnf clean all \
&& gem uninstall google-protobuf --version 3.17.3 --force && gem cleanup
&& gem uninstall google-protobuf --version 3.17.3 --force && gem cleanup \
&& rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/cache $RUBY_PATH/lib/ruby/gems/2.7.0/doc/ /usr/share/doc /root/.bundle/cache

# Make sure fluentd picks jemalloc 3.6.0 lib as default
ENV LD_PRELOAD="/usr/lib/libjemalloc.so"
Expand Down
4 changes: 2 additions & 2 deletions config-reloader/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright © 2018 VMware, Inc. All Rights Reserved.
# Copyright © 2022 VMware, Inc. All Rights Reserved.
# SPDX-License-Identifier: BSD-2-Clause

# builder image
FROM golang:1.17 as builder
FROM golang:1.17.9 as builder

WORKDIR /go/src/github.com/vmware/kube-fluentd-operator/config-reloader
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions config-reloader/validate-from-dir.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

dest=`mktemp -d`
dest=$(mktemp -d)

config-reloader \
--interval 0 \
Expand All @@ -14,7 +14,7 @@ config-reloader \

rc=0

for st in `find ${dest} -iname *.status`; do
for st in $(find ${dest} -iname *.status); do
ns=$(basename ${st})
ns=${ns%%.status}
ns=${ns#ns-}
Expand Down

0 comments on commit d737ce9

Please sign in to comment.