github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-19 04:15:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

use UBI9 as base image (#17156)

Browse source 
- the base image change from ubi8 to ubi9
- remove installation of curl
This commit is contained in:
kaisecheng 2025-02-28 09:29:19 +00:00 • committed by GitHub
parent 0f81816311
commit 2d69d06809
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 424 additions and 602 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.buildkite/scripts/exhaustive-tests/generate-steps.py
View file

@ -155,7 +155,7 @@ ci/acceptance_tests.sh"""),
def acceptance_docker_steps()-> list[typing.Any]: def acceptance_docker_steps()-> list[typing.Any]:
steps = [] steps = []
for flavor in ["full", "oss", "ubi8", "wolfi"]: for flavor in ["full", "oss", "ubi", "wolfi"]:
steps.append({ steps.append({
"label": f":docker: {flavor} flavor acceptance", "label": f":docker: {flavor} flavor acceptance",
"agents": gcp_agent(vm_name="ubuntu-2204", image_prefix="family/platform-ingest-logstash"), "agents": gcp_agent(vm_name="ubuntu-2204", image_prefix="family/platform-ingest-logstash"),

997
NOTICE.TXT
View file

File diff suppressed because it is too large Load diff

3
docker/templates/Dockerfile.erb
View file

@ -13,7 +13,7 @@
<% license = 'Elastic License' -%> <% license = 'Elastic License' -%>
<% end -%> <% end -%>
<% if image_flavor == 'full' || image_flavor == 'oss' -%> <% if image_flavor == 'full' || image_flavor == 'oss' -%>
<% base_image = 'docker.elastic.co/ubi8/ubi-minimal' -%> <% base_image = 'docker.elastic.co/ubi9/ubi-minimal' -%>
<% go_image = 'golang:1.23' -%> <% go_image = 'golang:1.23' -%>
<% package_manager = 'microdnf' -%> <% package_manager = 'microdnf' -%>
<% else -%> <% else -%>
@ -62,7 +62,6 @@ RUN for iter in {1..10}; do \
<%= package_manager %> install -y procps findutils tar gzip && \ <%= package_manager %> install -y procps findutils tar gzip && \
<%= package_manager %> install -y openssl && \ <%= package_manager %> install -y openssl && \
<%= package_manager %> install -y which shadow-utils && \ <%= package_manager %> install -y which shadow-utils && \
<%= package_manager %> install -y curl && \
<%= package_manager %> clean all && \ <%= package_manager %> clean all && \
<% else -%><%# 'wolfi' -%> <% else -%><%# 'wolfi' -%>
<%= package_manager %> add --no-cache curl bash openssl && \ <%= package_manager %> add --no-cache curl bash openssl && \

2
docs/reference/docker.md
View file

@ -5,7 +5,7 @@ mapped_pages:
# Running Logstash on Docker [docker] # Running Logstash on Docker [docker]
Docker images for Logstash are available from the Elastic Docker registry. The base image is [Red Hat Universal Base Image 8 Minimal](https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8). Docker images for Logstash are available from the Elastic Docker registry. The base image is [Red Hat Universal Base Image 9 Minimal](https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d).
A list of all published Docker images and tags is available at [www.docker.elastic.co](https://www.docker.elastic.co). The source code is in [GitHub](https://github.com/elastic/logstash/tree/master). A list of all published Docker images and tags is available at [www.docker.elastic.co](https://www.docker.elastic.co). The source code is in [GitHub](https://github.com/elastic/logstash/tree/master).

2
logstash-core/lib/logstash/dependency_report.rb
View file

@ -31,7 +31,7 @@ class LogStash::DependencyReport < Clamp::Command
OTHER_DEPENDENCIES = [ OTHER_DEPENDENCIES = [
["jruby", "", "http://jruby.org", "EPL-2.0"], ["jruby", "", "http://jruby.org", "EPL-2.0"],
["Red Hat Universal Base Image minimal", "8", "https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8", "Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf", "", "https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz"] ["Red Hat Universal Base Image minimal", "9", "https://catalog.redhat.com/software/containers/ubi9-minimal/61832888c0d15aff4912fe0d", "Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf", "", "https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz"]
] ]
def execute def execute

2
tools/dependencies-report/src/main/resources/licenseMapping.csv
View file

@ -169,7 +169,7 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"rack-session:",https://github.com/rack/rack-session,MIT "rack-session:",https://github.com/rack/rack-session,MIT
"rack:",http://rack.github.io/,MIT "rack:",http://rack.github.io/,MIT
"rake:",https://github.com/ruby/rake,MIT "rake:",https://github.com/ruby/rake,MIT
"Red Hat Universal Base Image minimal:",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz "Red Hat Universal Base Image minimal:",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
"redis:",https://github.com/redis/redis-rb,MIT "redis:",https://github.com/redis/redis-rb,MIT
"reline:",https://github.com/ruby/reline,BSD-2-Clause "reline:",https://github.com/ruby/reline,BSD-2-Clause
"rexml:",https://github.com/ruby/rexml,MIT "rexml:",https://github.com/ruby/rexml,MIT

Can't render this file because it has a wrong number of fields in line 2.

2
tools/dependencies-report/src/test/resources/expectedNoticeOutput.txt
View file

@ -1,6 +1,6 @@
========== ==========
Notice for: Red Hat Universal Base Image minimal-8 Notice for: Red Hat Universal Base Image minimal-9
---------- ----------
TEST TEST

2
tools/dependencies-report/src/test/resources/expectedOutput.txt
View file

@ -1,5 +1,5 @@
name,version,revision,url,license,copyright,sourceURL name,version,revision,url,license,copyright,sourceURL
Red Hat Universal Base Image minimal,8,,https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz Red Hat Universal Base Image minimal,9,,https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz
bundler,1.16.1,,https://rubygems.org/gems/bundler/versions/1.16.0,UnacceptableLicense|MIT,, bundler,1.16.1,,https://rubygems.org/gems/bundler/versions/1.16.0,UnacceptableLicense|MIT,,
com.fasterxml.jackson.core:jackson-core,2.7.3,,https://github.com/FasterXML/jackson-core/tree/jackson-core-2.7.3,Apache-2.0,, com.fasterxml.jackson.core:jackson-core,2.7.3,,https://github.com/FasterXML/jackson-core/tree/jackson-core-2.7.3,Apache-2.0,,
com.google.errorprone:javac-shaded,9-dev-r4023-3,,http://repo1.maven.org/maven2/com/google/errorprone/javac-shaded/9-dev-r4023-3/,EPL-1.0,, com.google.errorprone:javac-shaded,9-dev-r4023-3,,http://repo1.maven.org/maven2/com/google/errorprone/javac-shaded/9-dev-r4023-3/,EPL-1.0,,

2
tools/dependencies-report/src/test/resources/licenseMapping-conflicting.csv
View file

@ -61,4 +61,4 @@ dependency,dependencyUrl,licenseOverride
"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
"json-generator",https://github.com/flori/json,Ruby "json-generator",https://github.com/flori/json,Ruby
"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz "Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz

Can't render this file because it has a wrong number of fields in line 63.

2
tools/dependencies-report/src/test/resources/licenseMapping-good.csv
View file

@ -59,4 +59,4 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
"json-generator",https://github.com/flori/json,Ruby "json-generator",https://github.com/flori/json,Ruby
"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz "Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz

Can't render this file because it has a wrong number of fields in line 2.

2
tools/dependencies-report/src/test/resources/licenseMapping-missing.csv
View file

@ -60,4 +60,4 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
"json-generator",https://github.com/flori/json,Ruby "json-generator",https://github.com/flori/json,Ruby
"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz "Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz

Can't render this file because it has a wrong number of fields in line 2.

2
tools/dependencies-report/src/test/resources/licenseMapping-missingNotices.csv
View file

@ -62,4 +62,4 @@ dependency,dependencyUrl,licenseOverride,copyright,sourceURL
"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
"json-generator",https://github.com/flori/json,Ruby "json-generator",https://github.com/flori/json,Ruby
"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz "Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz

Can't render this file because it has a wrong number of fields in line 2.

2
tools/dependencies-report/src/test/resources/licenseMapping-missingUrls.csv
View file

@ -60,4 +60,4 @@ dependency,dependencyUrl,licenseOverride
"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
"json-generator",https://github.com/flori/json,Ruby "json-generator",https://github.com/flori/json,Ruby
"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz "Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz

Can't render this file because it has a wrong number of fields in line 62.

2
tools/dependencies-report/src/test/resources/licenseMapping-unacceptable.csv
View file

@ -57,4 +57,4 @@ dependency,dependencyUrl,licenseOverride
"junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0 "junit:junit:4.12",https://github.com/junit-team/junit4,Apache-2.0
"json-generator",https://github.com/flori/json,Ruby "json-generator",https://github.com/flori/json,Ruby
"tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross "tzinfo:",https://github.com/tzinfo/tzinfo,MIT,Philip Ross
"Red Hat Universal Base Image minimal:8",https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz "Red Hat Universal Base Image minimal:9",https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz

Can't render this file because it has a wrong number of fields in line 59.

2
tools/dependencies-report/src/test/resources/rubyDependencies.csv
View file

@ -14,4 +14,4 @@ control.js,,,MIT,,
json-generator,,https://github.com/flori/json,Ruby,, json-generator,,https://github.com/flori/json,Ruby,,
json-parser,,https://github.com/flori/json,Ruby,, json-parser,,https://github.com/flori/json,Ruby,,
tzinfo,,https://github.com/tzinfo/tzinfo,MIT,Philip Ross, tzinfo,,https://github.com/tzinfo/tzinfo,MIT,Philip Ross,
Red Hat Universal Base Image minimal,8,https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz Red Hat Universal Base Image minimal,9,https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d,Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf,,https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz

1 name version url license copyright sourceURL
14 json-generator https://github.com/flori/json Ruby
15 json-parser https://github.com/flori/json Ruby
16 tzinfo https://github.com/tzinfo/tzinfo MIT Philip Ross
17 Red Hat Universal Base Image minimal 8 9 https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8 https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/61832888c0d15aff4912fe0d Custom;https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/8/ubi-minimal-8-source.tar.gz https://oss-dependencies.elastic.co/red-hat-universal-base-image-minimal/9/ubi-minimal-9-source.tar.gz