Merge pull request #51 from scalyr/dtin-5237

DTIN-5237: Updated base image with multistage build

Author: jmakar-s1

CHANGELOG.md

@@ -1,7 +1,13 @@
-## 0.8.18 - June 13, 2024
-- Update fluentd docker image to `v1.17.0-1.0`
+## 0.9.0 - June 2nd, 2025
 
-## 0.8.17 - June 21, 2022
+- Bump rexml from 3.2.5 to 3.3.3 (via Dependabot)
+- Update fluentd Docker image to `v1.18.0-debian` with a multistage build
+
+## 0.8.18 - June 13th, 2024
+
+- Update fluentd Docker image to `v1.17.0-1.0`
+
+## 0.8.17 - June 21st, 2022
 
 - Update rake requirement from ~> 0.9 to ~> 13.0
 - Update yajl-ruby from 1.4.1 to 1.4.3

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-scalyr (0.8.18)
+    fluent-plugin-scalyr (0.9.0)
       ffi (= 1.15.5)
       fluentd (>= 0.14.0, < 2)
       rbzip2 (= 0.3.0)

VERSION

@@ -1 +1 @@
-0.8.18
+0.9.0

docker/Dockerfile

@@ -1,15 +1,20 @@
-FROM fluent/fluentd:v1.17.0-1.0
+FROM fluent/fluentd:v1.18.0-debian AS build
 
 USER root
 
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends build-essential ruby-dev zlib1g-dev
+
 COPY ./pkg/fluent-plugin-scalyr-*.gem /
 RUN mv /fluent-plugin-scalyr-*.gem /fluent-plugin-scalyr.gem
+RUN gem install --install-dir /bundle fluent-plugin-scalyr.gem \
+    && (cd /bundle; tar czf /bundle.tar.gz .)
+
+FROM fluent/fluentd:v1.18.0-debian
+
+USER root
 
-RUN apk add --no-cache --update --virtual .build-deps \
-        build-base ruby-dev \
- && gem install fluent-plugin-scalyr.gem \
- && gem sources --clear-all \
- && apk del .build-deps \
- && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem
+COPY --from=build /bundle.tar.gz /
+RUN tar xzf /bundle.tar.gz -C /usr/local/bundle && rm /bundle.tar.gz
 
 USER fluent