Skip to content

Commit bc418c4

Browse files
authored
chore(ci): Fix logstash build (#18199)
The logstash plugin build step in Github workflows failed https://github.com/grafana/loki/actions/runs/15814913050/job/44576897829 Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
1 parent a352f8b commit bc418c4

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

‎clients/cmd/logstash/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM logstash:9.0.2
22

33
USER logstash
4-
ENV PATH /usr/share/logstash/vendor/jruby/bin:/usr/share/logstash/vendor/bundle/jruby/2.5.0/bin:/usr/share/logstash/jdk/bin:$PATH
4+
ENV PATH /usr/share/logstash/vendor/jruby/bin:/usr/share/logstash/vendor/bundle/jruby/3.1.0/bin:/usr/share/logstash/jdk/bin:$PATH
55
ENV LOGSTASH_PATH /usr/share/logstash
6-
ENV GEM_PATH /usr/share/logstash/vendor/bundle/jruby/2.5.0
7-
ENV GEM_HOME /usr/share/logstash/vendor/bundle/jruby/2.5.0
6+
ENV GEM_PATH /usr/share/logstash/vendor/bundle/jruby/3.1.0
7+
ENV GEM_HOME /usr/share/logstash/vendor/bundle/jruby/3.1.0
88

9-
RUN gem install bundler:2.3.6
9+
RUN gem install bundler -v 2.6.9
1010

1111
COPY --chown=logstash:logstash ./clients/cmd/logstash/ /home/logstash/
1212
WORKDIR /home/logstash/

‎clients/cmd/logstash/Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ else
1212
end
1313

1414
gem "webmock", "~> 3.8"
15+
# I could not find the reason why the `cgi` gem is required after the upgrade of jruby inside the logstash bash Docker image.
16+
# However, the build fails without this dependency.
17+
gem "cgi"

0 commit comments

Comments
 (0)