Merge pull request #76 from kube-logging/ci-1

v1.16 image size and cleanup
kube-logging · Oct 9, 2023 · 4087237 · 4087237
2 parents c35dfcd + f79bf95
commit 4087237
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 188 deletions.
diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml
@@ -18,8 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         fluentd:
-          - v1.15-staging
           - v1.15-ruby3
+          - v1.16
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         fluentd:
-          - v1.15-staging
           - v1.15-ruby3
           - v1.16
 

diff --git a/v1.15-staging/Dockerfile b/v1.15-staging/Dockerfile
diff --git a/v1.15-staging/entrypoint.sh b/v1.15-staging/entrypoint.sh
diff --git a/v1.15-staging/fluent.conf b/v1.15-staging/fluent.conf
diff --git a/v1.15-staging/healthy.sh b/v1.15-staging/healthy.sh
diff --git a/v1.16/Dockerfile b/v1.16/Dockerfile
@@ -4,6 +4,8 @@ ENV FLUENTD_VERSION 1.16.2
 
 LABEL Description="Fluentd docker image" Vendor="Kube logging" Version="${FLUENTD_VERSION}"
 
+ADD ./Gemfile /Gemfile
+
 # Do not split this into multiple RUN!
 # Docker creates a layer for every RUN-Statement
 # therefore an 'apk delete' has no effect
@@ -24,10 +26,9 @@ RUN apk update \
         build-base \
         ruby-dev gnupg \
  && apk add $buildDeps \
- && echo 'gem: --no-document' >> /etc/gemrc
-ADD ./Gemfile /Gemfile
-RUN gem install bundler && bundle install 
-RUN apk del .build-deps $buildDeps \
+ && echo 'gem: --no-document' >> /etc/gemrc \
+ && gem install bundler && bundle install \
+ && apk del .build-deps $buildDeps \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 
 RUN addgroup -S fluent && adduser -S -G fluent fluent \