diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 0de4f46..662f457 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -14,16 +14,16 @@ FROM centos:7 AS builder ENV PATH /usr/share/elasticsearch/bin:$PATH -ENV JAVA_HOME /opt/jdk-13.0.2+8 +ENV JAVA_HOME /opt/jdk-14+36 -RUN for iter in {1..10}; do curl -L -s -S https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz | tar -C /opt -zx && \ +RUN for iter in {1..10}; do curl -L -s -S https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14%2B36/OpenJDK14U-jdk_x64_linux_hotspot_14_36.tar.gz | tar -C /opt -zx && \ exit_code=0 && break || exit_code=\$? && echo "download error: retry $iter in 10s" && sleep 10; done; \ (exit $exit_code) # Replace OpenJDK's built-in CA certificate keystore with the one from the OS # vendor. The latter is superior in several ways. # REF: https://github.com/elastic/elasticsearch-docker/issues/171 -RUN ln -sf /etc/pki/ca-trust/extracted/java/cacerts /opt/jdk-13.0.2+8/lib/security/cacerts +RUN ln -sf /etc/pki/ca-trust/extracted/java/cacerts /opt/jdk-14+36/lib/security/cacerts RUN yum install -y unzip which @@ -32,9 +32,9 @@ RUN groupadd -g 1000 elasticsearch && \ WORKDIR /usr/share/elasticsearch -RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.7.tar.gz && cd - +RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.8.tar.gz && cd - -RUN tar zxf /opt/elasticsearch-6.8.7.tar.gz --strip-components=1 +RUN tar zxf /opt/elasticsearch-6.8.8.tar.gz --strip-components=1 RUN grep ES_DISTRIBUTION_TYPE=tar /usr/share/elasticsearch/bin/elasticsearch-env \ && sed -ie 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env RUN mkdir -p config data logs @@ -50,9 +50,9 @@ COPY config/elasticsearch.yml config/log4j2.properties config/ FROM centos:7 ENV ELASTIC_CONTAINER true -ENV JAVA_HOME /opt/jdk-13.0.2+8 +ENV JAVA_HOME /opt/jdk-14+36 -COPY --from=builder /opt/jdk-13.0.2+8 /opt/jdk-13.0.2+8 +COPY --from=builder /opt/jdk-14+36 /opt/jdk-14+36 RUN for iter in {1..10}; do yum update --setopt=tsflags=nodocs -y && \ yum install -y --setopt=tsflags=nodocs nc unzip wget which && \ @@ -78,25 +78,25 @@ RUN chgrp 0 /usr/local/bin/docker-entrypoint.sh && \ EXPOSE 9200 9300 -LABEL org.label-schema.build-date="2020-02-26T14:38:01.193138Z" \ +LABEL org.label-schema.build-date="2020-03-18T23:22:18.622755Z" \ 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="c63e621eaba638f77ebb10e03f7637688eb0a726" \ + org.label-schema.vcs-ref="2f4c2240ecfc520baef4353a726f13fc59c12066" \ org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \ org.label-schema.vendor="Elastic" \ - org.label-schema.version="6.8.7" \ - org.opencontainers.image.created="2020-02-26T14:38:01.193138Z" \ + org.label-schema.version="6.8.8" \ + org.opencontainers.image.created="2020-03-18T23:22:18.622755Z" \ org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \ org.opencontainers.image.licenses="Elastic-License" \ - org.opencontainers.image.revision="c63e621eaba638f77ebb10e03f7637688eb0a726" \ + org.opencontainers.image.revision="2f4c2240ecfc520baef4353a726f13fc59c12066" \ 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="6.8.7" + org.opencontainers.image.version="6.8.8" ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] # Dummy overridable parameter parsed by entrypoint diff --git a/kibana/Dockerfile b/kibana/Dockerfile index ee0f813..8ac2cc5 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -7,10 +7,10 @@ # Extract Kibana and make various file manipulations. ################################################################################ FROM centos:7 AS prep_files -RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/kibana/kibana-6.8.7-linux-x86_64.tar.gz && cd - +RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/kibana/kibana-6.8.8-linux-x86_64.tar.gz && cd - RUN mkdir /usr/share/kibana WORKDIR /usr/share/kibana -RUN tar --strip-components=1 -zxf /opt/kibana-6.8.7-linux-x86_64.tar.gz +RUN tar --strip-components=1 -zxf /opt/kibana-6.8.8-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. @@ -50,6 +50,6 @@ RUN chmod g+ws /usr/share/kibana && find /usr/share/kibana -gid 0 -and -not -per 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" org.label-schema.version="6.8.7" org.label-schema.url="https://www.elastic.co/products/kibana" org.label-schema.vcs-url="https://github.com/elastic/kibana" org.label-schema.license="Elastic License" license="Elastic License" +LABEL org.label-schema.schema-version="1.0" org.label-schema.vendor="Elastic" org.label-schema.name="kibana" org.label-schema.version="6.8.8" org.label-schema.url="https://www.elastic.co/products/kibana" org.label-schema.vcs-url="https://github.com/elastic/kibana" org.label-schema.license="Elastic License" license="Elastic License" CMD ["/usr/local/bin/kibana-docker"] \ No newline at end of file diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 169cd63..d8fb1fa 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -13,9 +13,9 @@ RUN groupadd --gid 1000 logstash && \ logstash # Add Logstash itself. -RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-6.8.7.tar.gz | \ +RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-6.8.8.tar.gz | \ tar zxf - -C /usr/share && \ - mv /usr/share/logstash-6.8.7 /usr/share/logstash && \ + mv /usr/share/logstash-6.8.8 /usr/share/logstash && \ chown --recursive logstash:logstash /usr/share/logstash/ && \ chown -R logstash:root /usr/share/logstash && \ chmod -R g=u /usr/share/logstash && \ @@ -52,7 +52,7 @@ EXPOSE 9600 5044 LABEL org.label-schema.schema-version="1.0" \ org.label-schema.vendor="Elastic" \ org.label-schema.name="logstash" \ - org.label-schema.version="6.8.7" \ + org.label-schema.version="6.8.8" \ org.label-schema.url="https://www.elastic.co/products/logstash" \ org.label-schema.vcs-url="https://github.com/elastic/logstash" \ license="Elastic License"