diff --git a/README.md b/README.md index 7315f3a..4ad8909 100644 --- a/README.md +++ b/README.md @@ -78,4 +78,4 @@ and includes the full set of [free features](https://www.elastic.co/subscriptions). View the detailed release notes -[here](https://www.elastic.co/guide/en/elasticsearch/reference/dockefile_branchrule_test/es-release-notes.html). +[here](https://www.elastic.co/guide/en/elasticsearch/reference/8.13/es-release-notes.html). diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 8521433..ce7c016 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -43,7 +43,7 @@ RUN set -eux ; \ RUN mkdir /usr/share/elasticsearch WORKDIR /usr/share/elasticsearch -RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-8.14.1-linux-$(arch).tar.gz +RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-8.13.4-linux-$(arch).tar.gz RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1 @@ -135,25 +135,25 @@ RUN /etc/ca-certificates/update.d/docker-openjdk EXPOSE 9200 9300 -LABEL org.label-schema.build-date="2024-06-10T23:35:17.114581191Z" \ +LABEL org.label-schema.build-date="2024-05-06T22:04:45.107454559Z" \ org.label-schema.license="Elastic-License-2.0" \ 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="93a57a1a76f556d8aee6a90d1a95b06187501310" \ + org.label-schema.vcs-ref="da95df118650b55a500dcc181889ac35c6d8da7c" \ org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \ org.label-schema.vendor="Elastic" \ - org.label-schema.version="8.14.1" \ - org.opencontainers.image.created="2024-06-10T23:35:17.114581191Z" \ + org.label-schema.version="8.13.4" \ + org.opencontainers.image.created="2024-05-06T22:04:45.107454559Z" \ org.opencontainers.image.documentation="https://www.elastic.co/guide/en/elasticsearch/reference/index.html" \ org.opencontainers.image.licenses="Elastic-License-2.0" \ - org.opencontainers.image.revision="93a57a1a76f556d8aee6a90d1a95b06187501310" \ + org.opencontainers.image.revision="da95df118650b55a500dcc181889ac35c6d8da7c" \ 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="8.14.1" + org.opencontainers.image.version="8.13.4" # Our actual entrypoint is `tini`, a minimal but functional init program. It # calls the entrypoint we provide, while correctly forwarding signals. diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 26cc877..5c8a130 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl RUN cd /tmp && \ curl --retry 8 -s -L \ --output kibana.tar.gz \ - https://artifacts.elastic.co/downloads/kibana/kibana-8.14.1-linux-$(arch).tar.gz && \ + https://artifacts.elastic.co/downloads/kibana/kibana-8.13.4-linux-$(arch).tar.gz && \ cd - @@ -104,25 +104,25 @@ RUN groupadd --gid 1000 kibana && \ --home-dir /usr/share/kibana --no-create-home \ kibana -LABEL org.label-schema.build-date="2024-06-11T00:21:28.765Z" \ +LABEL org.label-schema.build-date="2024-05-07T06:06:37.059Z" \ 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="afbd904e868f2a48a2bbeb8ff20baee8d4aeb468" \ + org.label-schema.vcs-ref="f5dc24d1969f80e4aa3ced7cc375dd00554f8c0c" \ org.label-schema.vcs-url="https://github.com/elastic/kibana" \ org.label-schema.vendor="Elastic" \ - org.label-schema.version="8.14.1" \ - org.opencontainers.image.created="2024-06-11T00:21:28.765Z" \ + org.label-schema.version="8.13.4" \ + org.opencontainers.image.created="2024-05-07T06:06:37.059Z" \ org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \ org.opencontainers.image.licenses="Elastic License" \ - org.opencontainers.image.revision="afbd904e868f2a48a2bbeb8ff20baee8d4aeb468" \ + org.opencontainers.image.revision="f5dc24d1969f80e4aa3ced7cc375dd00554f8c0c" \ 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="8.14.1" + org.opencontainers.image.version="8.13.4" ENTRYPOINT ["/bin/tini", "--"] diff --git a/kibana/bin/kibana-docker b/kibana/bin/kibana-docker index 64f94ae..0f55457 100755 --- a/kibana/bin/kibana-docker +++ b/kibana/bin/kibana-docker @@ -39,7 +39,6 @@ kibana_vars=( csp.frame_ancestors csp.report_uri csp.report_to - csp.report_only.form_action data.autocomplete.valueSuggestions.terminateAfter data.autocomplete.valueSuggestions.timeout data.search.asyncSearch.waitForCompletion @@ -137,7 +136,6 @@ kibana_vars=( ops.interval path.data pid.file - profiler.signal regionmap savedObjects.maxImportExportSize savedObjects.maxImportPayloadBytes diff --git a/logstash/Dockerfile b/logstash/Dockerfile index c8aaf79..1b609f4 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -25,9 +25,9 @@ RUN groupadd --gid 1000 logstash && \ adduser --uid 1000 --gid 1000 --home /usr/share/logstash --no-create-home logstash # Add Logstash itself. -RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.14.1-linux-$(arch).tar.gz | \ +RUN curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.13.4-linux-$(arch).tar.gz | \ tar zxf - -C /usr/share && \ - mv /usr/share/logstash-8.14.1 /usr/share/logstash && \ + mv /usr/share/logstash-8.13.4 /usr/share/logstash && \ chown --recursive logstash:logstash /usr/share/logstash/ && \ chown -R logstash:root /usr/share/logstash && \ chmod -R g=u /usr/share/logstash && \ @@ -80,14 +80,14 @@ 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="8.14.1" \ - org.opencontainers.image.version="8.14.1" \ + org.label-schema.version="8.13.4" \ + org.opencontainers.image.version="8.13.4" \ 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=2024-06-10T18:33:17+00:00 \ - org.opencontainers.image.created=2024-06-10T18:33:17+00:00 + org.label-schema.build-date=2024-05-06T13:27:14+00:00 \ + org.opencontainers.image.created=2024-05-06T13:27:14+00:00 ENTRYPOINT ["/usr/local/bin/docker-entrypoint"] diff --git a/logstash/env2yaml/env2yaml-amd64 b/logstash/env2yaml/env2yaml-amd64 index db1004a..1954371 100755 Binary files a/logstash/env2yaml/env2yaml-amd64 and b/logstash/env2yaml/env2yaml-amd64 differ diff --git a/logstash/env2yaml/env2yaml-arm64 b/logstash/env2yaml/env2yaml-arm64 index b13fd75..bfb4874 100755 Binary files a/logstash/env2yaml/env2yaml-arm64 and b/logstash/env2yaml/env2yaml-arm64 differ