github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixes an issue where headless_shell doesn't get properly closed (and … (#40924) (#42078)

Browse source 
* Fixes an issue where headless_shell doesn't get properly closed (and thus zombied)

* Using cURL vs wget

* Break-up the command and verify the checksum
This commit is contained in:
Joel Griffith 2019-07-30 10:40:59 -07:00 • committed by GitHub
parent a9bc033092
commit 95422263ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.js
View file

@ -32,7 +32,7 @@ function generator({ artifactTarball, versionTag, license, usePublicArtifact })
#
# ** THIS IS AN AUTO-GENERATED FILE **
#
################################################################################
# Build stage 0
# Extract Kibana and make various file manipulations.
@ -48,43 +48,49 @@ function generator({ artifactTarball, versionTag, license, usePublicArtifact })
# REF: https://docs.openshift.org/latest/creating_images/guidelines.html
RUN chmod -R g=u /usr/share/kibana
RUN find /usr/share/kibana -type d -exec chmod g+s {} \\;
################################################################################
# Build stage 1
# Copy prepared files from the previous stage and complete the image.
################################################################################
FROM centos:7
EXPOSE 5601
# Add Reporting dependencies.
RUN yum update -y && yum install -y fontconfig freetype && yum clean all
# Add an init process, check the checksum to make sure it's a match
RUN curl -L -o /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
RUN echo "37f2c1f0372a45554f1b89924fbb134fc24c3756efaedf11e07f599494e0eff9 /usr/local/bin/dumb-init" | sha256sum -c -
RUN chmod +x /usr/local/bin/dumb-init
# Bring in Kibana from the initial stage.
COPY --from=prep_files --chown=1000:0 /usr/share/kibana /usr/share/kibana
WORKDIR /usr/share/kibana
RUN ln -s /usr/share/kibana /opt/kibana
ENV ELASTIC_CONTAINER true
ENV PATH=/usr/share/kibana/bin:$PATH
# Set some Kibana configuration defaults.
COPY --chown=1000:0 config/kibana.yml /usr/share/kibana/config/kibana.yml
# Add the launcher/wrapper script. It knows how to interpret environment
# variables and translate them to Kibana CLI options.
COPY --chown=1000:0 bin/kibana-docker /usr/local/bin/
# Ensure gid 0 write permissions for OpenShift.
RUN chmod g+ws /usr/share/kibana && \\
find /usr/share/kibana -gid 0 -and -not -perm /g+w -exec chmod g+w {} \\;
# Provide a non-root user to run the process.
RUN groupadd --gid 1000 kibana && \\
useradd --uid 1000 --gid 1000 \\
--home-dir /usr/share/kibana --no-create-home \\
kibana
USER kibana
LABEL org.label-schema.schema-version="1.0" \\
org.label-schema.vendor="Elastic" \\
org.label-schema.name="kibana" \\
@ -92,7 +98,9 @@ function generator({ artifactTarball, versionTag, license, usePublicArtifact })
org.label-schema.url="https://www.elastic.co/products/kibana" \\
org.label-schema.vcs-url="https://github.com/elastic/kibana" \\
license="${ license }"
ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
CMD ["/usr/local/bin/kibana-docker"]
`);
}