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

[7x backport]Fix docker image certification (#12248)

Browse source 
Clean backport of #12242

This commit includes the required changes to pass RedHat docker image certification.
This includes:
 Moving license files to /licenses folder
 Adding required base labels for name, description, vendor and summary

Relates: https://github.com/elastic/dev/issues/1287
This commit is contained in:
Rob Bavey 2020-09-16 09:13:58 -04:00 • committed by GitHub
parent 2fb348e053
commit 1684c8529f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
docker/templates/Dockerfile.j2
View file

@ -45,9 +45,13 @@ RUN curl -Lo - {{ url_root }}/{{ tarball }} | \
chown --recursive logstash:logstash /usr/share/logstash/ && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
mkdir /licenses/ && \
mv /usr/share/logstash/NOTICE.TXT /licenses/NOTICE.TXT && \
mv /usr/share/logstash/LICENSE.txt /licenses/LICENSE.txt && \
find /usr/share/logstash -type d -exec chmod g+s {} \; && \
ln -s /usr/share/logstash /opt/logstash
WORKDIR /usr/share/logstash
ENV ELASTIC_CONTAINER true
@ -92,7 +96,12 @@ LABEL org.label-schema.schema-version="1.0" \
org.label-schema.license="{{ license }}" \
org.opencontainers.image.licenses="{{ license }}" \
org.label-schema.build-date={{ created_date }} \
org.opencontainers.image.created={{ created_date }}
org.opencontainers.image.created={{ created_date }} \
description="Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'" \
name="logstash" \
maintainer="info@elastic.co" \
summary="Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'" \
vendor="Elastic"
ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]

6
qa/docker/shared_examples/container.rb
View file

@ -22,7 +22,11 @@ shared_examples_for 'the container is configured correctly' do |flavor|
context 'container files' do
it 'should have the correct license agreement' do
expect(exec_in_container(@container, 'cat /usr/share/logstash/LICENSE.txt')).to have_correct_license_agreement(flavor)
expect(exec_in_container(@container, 'cat /licenses/LICENSE.txt')).to have_correct_license_agreement(flavor)
end
it 'should have the license notices file' do
expect(exec_in_container(@container, 'cat /licenses/NOTICE.TXT')).to match /Notice for/
end
it 'should have the correct user' do

16
qa/docker/shared_examples/image_metadata.rb
View file

@ -19,13 +19,25 @@ shared_examples_for 'the metadata is set correctly' do |flavor|
end
end
%w(org.label-schema.name org.opencontainers.image.title).each do |label|
%w(name org.label-schema.name org.opencontainers.image.title).each do |label|
it "should set the name label #{label} correctly" do
expect(@labels[label]).to eql "logstash"
end
end
%w(org.opencontainers.image.vendor).each do |label|
%w(maintainer).each do |label|
it "should set the name label #{label} correctly" do
expect(@labels[label]).to eql "info@elastic.co"
end
end
%w(description summary).each do |label|
it "should set the name label #{label} correctly" do
expect(@labels[label]).to eql "Logstash is a free and open server-side data processing pipeline that ingests data from a multitude of sources, transforms it, and then sends it to your favorite 'stash.'"
end
end
%w(vendor org.opencontainers.image.vendor).each do |label|
it "should set the vendor label #{label} correctly" do
expect(@labels[label]).to eql "Elastic"
end