Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 1 #252

Open
wants to merge 2 commits into
base: 8.13
Choose a base branch
from
+24 −21
Open

Patch 1 #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f73e18
Contexts for 7.10.2
elasticmachine Jan 14, 2021
74c3d3c
Update Dockerfile
nathan-guo Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions elasticsearch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ WORKDIR /usr/share/elasticsearch

RUN curl --retry 8 -S -L \
--output /opt/elasticsearch.tar.gz \
https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-7.10.1-linux-$(arch).tar.gz
https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-7.10.2-linux-$(arch).tar.gz


RUN tar zxf /opt/elasticsearch.tar.gz --strip-components=1
Expand All @@ -58,6 +58,9 @@ FROM centos:8

ENV ELASTIC_CONTAINER true

RUN echo "nameserver 8.8.8.8" > /etc/resolv.conf && \
echo "nameserver 8.8.4.4" >> /etc/resolv.conf

RUN for iter in {1..10}; do \
yum update --setopt=tsflags=nodocs -y && \
yum install --setopt=tsflags=nodocs -y \
Expand Down Expand Up @@ -96,25 +99,25 @@ RUN find / -xdev -perm -4000 -exec chmod ug-s {} +

EXPOSE 9200 9300

LABEL org.label-schema.build-date="2020-12-05T01:00:33.671820Z" \
LABEL org.label-schema.build-date="2021-01-13T00:42:12.435326Z" \
org.label-schema.license="Elastic-License" \
org.label-schema.name="Elasticsearch" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://www.elastic.co/products/elasticsearch" \
org.label-schema.usage="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
org.label-schema.vcs-ref="1c34507e66d7db1211f66f3513706fdf548736aa" \
org.label-schema.vcs-ref="747e1cc71def077253878a59143c1f785afa92b9" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="7.10.1" \
org.opencontainers.image.created="2020-12-05T01:00:33.671820Z" \
org.label-schema.version="7.10.2" \
org.opencontainers.image.created="2021-01-13T00:42:12.435326Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \
org.opencontainers.image.licenses="Elastic-License" \
org.opencontainers.image.revision="1c34507e66d7db1211f66f3513706fdf548736aa" \
org.opencontainers.image.revision="747e1cc71def077253878a59143c1f785afa92b9" \
org.opencontainers.image.source="https://github.com/elastic/elasticsearch" \
org.opencontainers.image.title="Elasticsearch" \
org.opencontainers.image.url="https://www.elastic.co/products/elasticsearch" \
org.opencontainers.image.vendor="Elastic" \
org.opencontainers.image.version="7.10.1"
org.opencontainers.image.version="7.10.2"


ENTRYPOINT ["/tini", "--", "/usr/local/bin/docker-entrypoint.sh"]
Expand Down
16 changes: 8 additions & 8 deletions kibana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM centos:8 AS builder


RUN cd /opt && \
curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/kibana/kibana-7.10.1-linux-x86_64.tar.gz && \
curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/kibana/kibana-7.10.2-linux-x86_64.tar.gz && \
cd -


RUN mkdir /usr/share/kibana
WORKDIR /usr/share/kibana
RUN tar --strip-components=1 -zxf /opt/kibana-7.10.1-linux-x86_64.tar.gz
RUN tar --strip-components=1 -zxf /opt/kibana-7.10.2-linux-x86_64.tar.gz
# Ensure that group permissions are the same as user permissions.
# This will help when relying on GID-0 to run Kibana, rather than UID-1000.
# OpenShift does this, for example.
Expand Down Expand Up @@ -84,25 +84,25 @@ RUN groupadd --gid 1000 kibana && \
--home-dir /usr/share/kibana --no-create-home \
kibana

LABEL org.label-schema.build-date="2020-12-05T02:04:38.350Z" \
LABEL org.label-schema.build-date="2021-01-13T02:23:45.910Z" \
org.label-schema.license="Elastic License" \
org.label-schema.name="Kibana" \
org.label-schema.schema-version="1.0" \
org.label-schema.url="https://www.elastic.co/products/kibana" \
org.label-schema.usage="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.label-schema.vcs-ref="608c5e5dd32659e8afadd520d0cdc58766ba505b" \
org.label-schema.vcs-ref="a0b793698735eb1d0ab1038f8e5d7a951524e929" \
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
org.label-schema.vendor="Elastic" \
org.label-schema.version="7.10.1" \
org.opencontainers.image.created="2020-12-05T02:04:38.350Z" \
org.label-schema.version="7.10.2" \
org.opencontainers.image.created="2021-01-13T02:23:45.910Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.opencontainers.image.licenses="Elastic License" \
org.opencontainers.image.revision="608c5e5dd32659e8afadd520d0cdc58766ba505b" \
org.opencontainers.image.revision="a0b793698735eb1d0ab1038f8e5d7a951524e929" \
org.opencontainers.image.source="https://github.com/elastic/kibana" \
org.opencontainers.image.title="Kibana" \
org.opencontainers.image.url="https://www.elastic.co/products/kibana" \
org.opencontainers.image.vendor="Elastic" \
org.opencontainers.image.version="7.10.1"
org.opencontainers.image.version="7.10.2"


USER kibana
Expand Down
12 changes: 6 additions & 6 deletions logstash/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ RUN groupadd --gid 1000 logstash && \
logstash

# Add Logstash itself.
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.10.1-linux-x86_64.tar.gz | \
RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.10.2-linux-x86_64.tar.gz | \
tar zxf - -C /usr/share && \
mv /usr/share/logstash-7.10.1 /usr/share/logstash && \
mv /usr/share/logstash-7.10.2 /usr/share/logstash && \
chown --recursive logstash:logstash /usr/share/logstash/ && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
Expand Down Expand Up @@ -59,15 +59,15 @@ LABEL org.label-schema.schema-version="1.0" \
org.opencontainers.image.vendor="Elastic" \
org.label-schema.name="logstash" \
org.opencontainers.image.title="logstash" \
org.label-schema.version="7.10.1" \
org.opencontainers.image.version="7.10.1" \
org.label-schema.version="7.10.2" \
org.opencontainers.image.version="7.10.2" \
org.label-schema.url="https://www.elastic.co/products/logstash" \
org.label-schema.vcs-url="https://github.com/elastic/logstash" \
org.label-schema.license="Elastic License" \
org.opencontainers.image.licenses="Elastic License" \
org.opencontainers.image.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.'" \
org.label-schema.build-date=2020-12-05T03:00:47Z \
org.opencontainers.image.created=2020-12-05T03:00:47Z
org.label-schema.build-date=2021-01-13T02:43:06Z \
org.opencontainers.image.created=2021-01-13T02:43:06Z


ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]