Update ELK to 8.11.3, 7.17.16, backfill missed 8.11.2 #15894
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 266b67f:diff --git a/_bashbrew-cat b/_bashbrew-cat
index cfea52a..35c8029 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,15 +4,20 @@ GitRepo: https://github.com/elastic/dockerfiles.git
Directory: elasticsearch
Builder: buildkit
-Tags: 7.17.15
+Tags: 7.17.16
Architectures: amd64, arm64v8
GitFetch: refs/heads/7.17
-GitCommit: 63269da8548948c20f3e1650cebbed1ae5eee90e
+GitCommit: f3f1c976063b3549ed75e18aa99d06fdf51f8857
-Tags: 8.11.1
+Tags: 8.11.2
Architectures: amd64, arm64v8
GitFetch: refs/heads/8.11
-GitCommit: 0dbf0d4297a2bf48d0cd980935431c121396885d
+GitCommit: 58aa6df8045922c7c6ac92055a120365e158dd20
+
+Tags: 8.11.3
+Architectures: amd64, arm64v8
+GitFetch: refs/heads/8.11
+GitCommit: 1484679916b52a402f0d02ea290d60f6e1eca39a
# kibana
@@ -21,15 +26,20 @@ GitRepo: https://github.com/elastic/dockerfiles.git
Directory: kibana
Builder: buildkit
-Tags: 7.17.15
+Tags: 7.17.16
Architectures: amd64, arm64v8
GitFetch: refs/heads/7.17
-GitCommit: 63269da8548948c20f3e1650cebbed1ae5eee90e
+GitCommit: f3f1c976063b3549ed75e18aa99d06fdf51f8857
-Tags: 8.11.1
+Tags: 8.11.2
Architectures: amd64, arm64v8
GitFetch: refs/heads/8.11
-GitCommit: 0dbf0d4297a2bf48d0cd980935431c121396885d
+GitCommit: 58aa6df8045922c7c6ac92055a120365e158dd20
+
+Tags: 8.11.3
+Architectures: amd64, arm64v8
+GitFetch: refs/heads/8.11
+GitCommit: 1484679916b52a402f0d02ea290d60f6e1eca39a
# logstash
@@ -38,12 +48,17 @@ GitRepo: https://github.com/elastic/dockerfiles.git
Directory: logstash
Builder: buildkit
-Tags: 7.17.15
+Tags: 7.17.16
Architectures: amd64, arm64v8
GitFetch: refs/heads/7.17
-GitCommit: 63269da8548948c20f3e1650cebbed1ae5eee90e
+GitCommit: f3f1c976063b3549ed75e18aa99d06fdf51f8857
+
+Tags: 8.11.2
+Architectures: amd64, arm64v8
+GitFetch: refs/heads/8.11
+GitCommit: 58aa6df8045922c7c6ac92055a120365e158dd20
-Tags: 8.11.1
+Tags: 8.11.3
Architectures: amd64, arm64v8
GitFetch: refs/heads/8.11
-GitCommit: 0dbf0d4297a2bf48d0cd980935431c121396885d
+GitCommit: 1484679916b52a402f0d02ea290d60f6e1eca39a
diff --git a/_bashbrew-list b/_bashbrew-list
index cbeee8f..37e2f99 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,9 @@
-elasticsearch:7.17.15
-elasticsearch:8.11.1
-kibana:7.17.15
-kibana:8.11.1
-logstash:7.17.15
-logstash:8.11.1
+elasticsearch:7.17.16
+elasticsearch:8.11.2
+elasticsearch:8.11.3
+kibana:7.17.16
+kibana:8.11.2
+kibana:8.11.3
+logstash:7.17.16
+logstash:8.11.2
+logstash:8.11.3
diff --git a/elasticsearch_7.17.15/Dockerfile b/elasticsearch_7.17.16/Dockerfile
similarity index 94%
rename from elasticsearch_7.17.15/Dockerfile
rename to elasticsearch_7.17.16/Dockerfile
index 7c17947..ef1d3ff 100644
--- a/elasticsearch_7.17.15/Dockerfile
+++ b/elasticsearch_7.17.16/Dockerfile
@@ -42,7 +42,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-7.17.15-linux-$(arch).tar.gz
+RUN curl --retry 10 -S -L --output /tmp/elasticsearch.tar.gz https://artifacts-no-kpi.elastic.co/downloads/elasticsearch/elasticsearch-7.17.16-linux-$(arch).tar.gz
RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1
@@ -134,25 +134,25 @@ RUN /etc/ca-certificates/update.d/docker-openjdk
EXPOSE 9200 9300
-LABEL org.label-schema.build-date="2023-11-10T22:03:46.987399016Z" \
+LABEL org.label-schema.build-date="2023-12-08T10:06:54.672540567Z" \
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="0b8ecfb4378335f4689c4223d1f1115f16bef3ba" \
+ org.label-schema.vcs-ref="2b23fa076334f8d4651aeebe458a955a2ae23218" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
- org.label-schema.version="7.17.15" \
- org.opencontainers.image.created="2023-11-10T22:03:46.987399016Z" \
+ org.label-schema.version="7.17.16" \
+ org.opencontainers.image.created="2023-12-08T10:06:54.672540567Z" \
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="0b8ecfb4378335f4689c4223d1f1115f16bef3ba" \
+ org.opencontainers.image.revision="2b23fa076334f8d4651aeebe458a955a2ae23218" \
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.17.15"
+ org.opencontainers.image.version="7.17.16"
# Our actual entrypoint is `tini`, a minimal but functional init program. It
# calls the entrypoint we provide, while correctly forwarding signals.
diff --git a/elasticsearch_7.17.15/bin/docker-entrypoint.sh b/elasticsearch_7.17.16/bin/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_7.17.15/bin/docker-entrypoint.sh
rename to elasticsearch_7.17.16/bin/docker-entrypoint.sh
diff --git a/elasticsearch_7.17.15/bin/docker-openjdk b/elasticsearch_7.17.16/bin/docker-openjdk
similarity index 100%
copy from elasticsearch_7.17.15/bin/docker-openjdk
copy to elasticsearch_7.17.16/bin/docker-openjdk
diff --git a/elasticsearch_7.17.15/config/elasticsearch.yml b/elasticsearch_7.17.16/config/elasticsearch.yml
similarity index 100%
copy from elasticsearch_7.17.15/config/elasticsearch.yml
copy to elasticsearch_7.17.16/config/elasticsearch.yml
diff --git a/elasticsearch_7.17.15/config/log4j2.properties b/elasticsearch_7.17.16/config/log4j2.properties
similarity index 100%
rename from elasticsearch_7.17.15/config/log4j2.properties
rename to elasticsearch_7.17.16/config/log4j2.properties
diff --git a/elasticsearch_8.11.1/Dockerfile b/elasticsearch_8.11.2/Dockerfile
similarity index 94%
copy from elasticsearch_8.11.1/Dockerfile
copy to elasticsearch_8.11.2/Dockerfile
index 1ce8117..dff2121 100644
--- a/elasticsearch_8.11.1/Dockerfile
+++ b/elasticsearch_8.11.2/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.11.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.11.2-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="2023-11-11T10:05:59.421038163Z" \
+LABEL org.label-schema.build-date="2023-12-05T10:03:47.729926671Z" \
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="6f9ff581fbcde658e6f69d6ce03050f060d1fd0c" \
+ org.label-schema.vcs-ref="76013fa76dcbf144c886990c6290715f5dc2ae20" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
- org.label-schema.version="8.11.1" \
- org.opencontainers.image.created="2023-11-11T10:05:59.421038163Z" \
+ org.label-schema.version="8.11.2" \
+ org.opencontainers.image.created="2023-12-05T10:03:47.729926671Z" \
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="6f9ff581fbcde658e6f69d6ce03050f060d1fd0c" \
+ org.opencontainers.image.revision="76013fa76dcbf144c886990c6290715f5dc2ae20" \
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.11.1"
+ org.opencontainers.image.version="8.11.2"
# Our actual entrypoint is `tini`, a minimal but functional init program. It
# calls the entrypoint we provide, while correctly forwarding signals.
diff --git a/elasticsearch_8.11.1/bin/docker-entrypoint.sh b/elasticsearch_8.11.2/bin/docker-entrypoint.sh
similarity index 100%
copy from elasticsearch_8.11.1/bin/docker-entrypoint.sh
copy to elasticsearch_8.11.2/bin/docker-entrypoint.sh
diff --git a/elasticsearch_8.11.1/bin/docker-openjdk b/elasticsearch_8.11.2/bin/docker-openjdk
similarity index 100%
rename from elasticsearch_8.11.1/bin/docker-openjdk
rename to elasticsearch_8.11.2/bin/docker-openjdk
diff --git a/elasticsearch_8.11.1/config/elasticsearch.yml b/elasticsearch_8.11.2/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_8.11.1/config/elasticsearch.yml
rename to elasticsearch_8.11.2/config/elasticsearch.yml
diff --git a/elasticsearch_8.11.1/config/log4j2.properties b/elasticsearch_8.11.2/config/log4j2.properties
similarity index 100%
copy from elasticsearch_8.11.1/config/log4j2.properties
copy to elasticsearch_8.11.2/config/log4j2.properties
diff --git a/elasticsearch_8.11.1/Dockerfile b/elasticsearch_8.11.3/Dockerfile
similarity index 94%
rename from elasticsearch_8.11.1/Dockerfile
rename to elasticsearch_8.11.3/Dockerfile
index 1ce8117..0cabec4 100644
--- a/elasticsearch_8.11.1/Dockerfile
+++ b/elasticsearch_8.11.3/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.11.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.11.3-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="2023-11-11T10:05:59.421038163Z" \
+LABEL org.label-schema.build-date="2023-12-08T11:33:53.634979452Z" \
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="6f9ff581fbcde658e6f69d6ce03050f060d1fd0c" \
+ org.label-schema.vcs-ref="64cf052f3b56b1fd4449f5454cb88aca7e739d9a" \
org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
org.label-schema.vendor="Elastic" \
- org.label-schema.version="8.11.1" \
- org.opencontainers.image.created="2023-11-11T10:05:59.421038163Z" \
+ org.label-schema.version="8.11.3" \
+ org.opencontainers.image.created="2023-12-08T11:33:53.634979452Z" \
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="6f9ff581fbcde658e6f69d6ce03050f060d1fd0c" \
+ org.opencontainers.image.revision="64cf052f3b56b1fd4449f5454cb88aca7e739d9a" \
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.11.1"
+ org.opencontainers.image.version="8.11.3"
# Our actual entrypoint is `tini`, a minimal but functional init program. It
# calls the entrypoint we provide, while correctly forwarding signals.
diff --git a/elasticsearch_8.11.1/bin/docker-entrypoint.sh b/elasticsearch_8.11.3/bin/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_8.11.1/bin/docker-entrypoint.sh
rename to elasticsearch_8.11.3/bin/docker-entrypoint.sh
diff --git a/elasticsearch_7.17.15/bin/docker-openjdk b/elasticsearch_8.11.3/bin/docker-openjdk
similarity index 100%
rename from elasticsearch_7.17.15/bin/docker-openjdk
rename to elasticsearch_8.11.3/bin/docker-openjdk
diff --git a/elasticsearch_7.17.15/config/elasticsearch.yml b/elasticsearch_8.11.3/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_7.17.15/config/elasticsearch.yml
rename to elasticsearch_8.11.3/config/elasticsearch.yml
diff --git a/elasticsearch_8.11.1/config/log4j2.properties b/elasticsearch_8.11.3/config/log4j2.properties
similarity index 100%
rename from elasticsearch_8.11.1/config/log4j2.properties
rename to elasticsearch_8.11.3/config/log4j2.properties
diff --git a/kibana_7.17.15/Dockerfile b/kibana_7.17.16/Dockerfile
similarity index 92%
rename from kibana_7.17.15/Dockerfile
rename to kibana_7.17.16/Dockerfile
index 8907634..c46b0e4 100644
--- a/kibana_7.17.15/Dockerfile
+++ b/kibana_7.17.16/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-7.17.15-linux-$(arch).tar.gz && \
+ https://artifacts.elastic.co/downloads/kibana/kibana-7.17.16-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="2023-11-10T20:46:53.174Z" \
+LABEL org.label-schema.build-date="2023-12-08T12:07:39.833Z" \
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="60e0d4fa38a2c99350f1533c141f641edbb8e608" \
+ org.label-schema.vcs-ref="5838d16e60eb684b785702c80ff41e59d344fe1f" \
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
org.label-schema.vendor="Elastic" \
- org.label-schema.version="7.17.15" \
- org.opencontainers.image.created="2023-11-10T20:46:53.174Z" \
+ org.label-schema.version="7.17.16" \
+ org.opencontainers.image.created="2023-12-08T12:07:39.833Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.opencontainers.image.licenses="Elastic License" \
- org.opencontainers.image.revision="60e0d4fa38a2c99350f1533c141f641edbb8e608" \
+ org.opencontainers.image.revision="5838d16e60eb684b785702c80ff41e59d344fe1f" \
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.17.15"
+ org.opencontainers.image.version="7.17.16"
ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_7.17.15/bin/kibana-docker b/kibana_7.17.16/bin/kibana-docker
similarity index 100%
rename from kibana_7.17.15/bin/kibana-docker
rename to kibana_7.17.16/bin/kibana-docker
diff --git a/kibana_7.17.15/config/kibana.yml b/kibana_7.17.16/config/kibana.yml
similarity index 100%
copy from kibana_7.17.15/config/kibana.yml
copy to kibana_7.17.16/config/kibana.yml
diff --git a/kibana_8.11.1/Dockerfile b/kibana_8.11.2/Dockerfile
similarity index 91%
copy from kibana_8.11.1/Dockerfile
copy to kibana_8.11.2/Dockerfile
index 2c1d60e..3c18f59 100644
--- a/kibana_8.11.1/Dockerfile
+++ b/kibana_8.11.2/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.11.1-linux-$(arch).tar.gz && \
+ https://artifacts.elastic.co/downloads/kibana/kibana-8.11.2-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="2023-11-10T21:05:44.206Z" \
+LABEL org.label-schema.build-date="2023-12-05T12:05:54.257Z" \
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="09feaf416f986b239b8e8ad95ecdda0f9d56ebec" \
+ org.label-schema.vcs-ref="92746356b61c3e3ac62b6d7045727f8d737fa4b5" \
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
org.label-schema.vendor="Elastic" \
- org.label-schema.version="8.11.1" \
- org.opencontainers.image.created="2023-11-10T21:05:44.206Z" \
+ org.label-schema.version="8.11.2" \
+ org.opencontainers.image.created="2023-12-05T12:05:54.257Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.opencontainers.image.licenses="Elastic License" \
- org.opencontainers.image.revision="09feaf416f986b239b8e8ad95ecdda0f9d56ebec" \
+ org.opencontainers.image.revision="92746356b61c3e3ac62b6d7045727f8d737fa4b5" \
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.11.1"
+ org.opencontainers.image.version="8.11.2"
ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_8.11.1/bin/kibana-docker b/kibana_8.11.2/bin/kibana-docker
similarity index 100%
copy from kibana_8.11.1/bin/kibana-docker
copy to kibana_8.11.2/bin/kibana-docker
diff --git a/kibana_8.11.1/config/kibana.yml b/kibana_8.11.2/config/kibana.yml
similarity index 100%
rename from kibana_8.11.1/config/kibana.yml
rename to kibana_8.11.2/config/kibana.yml
diff --git a/kibana_8.11.1/Dockerfile b/kibana_8.11.3/Dockerfile
similarity index 91%
rename from kibana_8.11.1/Dockerfile
rename to kibana_8.11.3/Dockerfile
index 2c1d60e..1105f0f 100644
--- a/kibana_8.11.1/Dockerfile
+++ b/kibana_8.11.3/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.11.1-linux-$(arch).tar.gz && \
+ https://artifacts.elastic.co/downloads/kibana/kibana-8.11.3-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="2023-11-10T21:05:44.206Z" \
+LABEL org.label-schema.build-date="2023-12-08T16:30:01.542Z" \
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="09feaf416f986b239b8e8ad95ecdda0f9d56ebec" \
+ org.label-schema.vcs-ref="cc11667953f4734af414e8d8977b8d9dda5698ef" \
org.label-schema.vcs-url="https://github.com/elastic/kibana" \
org.label-schema.vendor="Elastic" \
- org.label-schema.version="8.11.1" \
- org.opencontainers.image.created="2023-11-10T21:05:44.206Z" \
+ org.label-schema.version="8.11.3" \
+ org.opencontainers.image.created="2023-12-08T16:30:01.542Z" \
org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
org.opencontainers.image.licenses="Elastic License" \
- org.opencontainers.image.revision="09feaf416f986b239b8e8ad95ecdda0f9d56ebec" \
+ org.opencontainers.image.revision="cc11667953f4734af414e8d8977b8d9dda5698ef" \
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.11.1"
+ org.opencontainers.image.version="8.11.3"
ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_8.11.1/bin/kibana-docker b/kibana_8.11.3/bin/kibana-docker
similarity index 100%
rename from kibana_8.11.1/bin/kibana-docker
rename to kibana_8.11.3/bin/kibana-docker
diff --git a/kibana_7.17.15/config/kibana.yml b/kibana_8.11.3/config/kibana.yml
similarity index 100%
rename from kibana_7.17.15/config/kibana.yml
rename to kibana_8.11.3/config/kibana.yml
diff --git a/logstash_7.17.15/Dockerfile b/logstash_7.17.16/Dockerfile
similarity index 90%
rename from logstash_7.17.15/Dockerfile
rename to logstash_7.17.16/Dockerfile
index ca1e63a..a44948e 100644
--- a/logstash_7.17.15/Dockerfile
+++ b/logstash_7.17.16/Dockerfile
@@ -25,9 +25,9 @@ RUN groupadd --gid 1000 logstash && \
# Add Logstash itself.
RUN \
-curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.15-linux-$(arch).tar.gz | \
+curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.16-linux-$(arch).tar.gz | \
tar zxf - -C /usr/share && \
- mv /usr/share/logstash-7.17.15 /usr/share/logstash && \
+ mv /usr/share/logstash-7.17.16 /usr/share/logstash && \
chown --recursive logstash:logstash /usr/share/logstash/ && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
@@ -64,13 +64,13 @@ 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.17.15" \
- org.opencontainers.image.version="7.17.15" \
+ org.label-schema.version="7.17.16" \
+ org.opencontainers.image.version="7.17.16" \
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=2023-10-10T17:45:59+00:00 \
-org.opencontainers.image.created=2023-10-10T17:45:59+00:00
+ org.label-schema.build-date=2023-12-05T12:24:52+00:00 \
+org.opencontainers.image.created=2023-12-05T12:24:52+00:00
ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_7.17.15/bin/docker-entrypoint b/logstash_7.17.16/bin/docker-entrypoint
similarity index 100%
rename from logstash_7.17.15/bin/docker-entrypoint
rename to logstash_7.17.16/bin/docker-entrypoint
diff --git a/logstash_7.17.15/config/log4j2.properties b/logstash_7.17.16/config/log4j2.properties
similarity index 100%
copy from logstash_7.17.15/config/log4j2.properties
copy to logstash_7.17.16/config/log4j2.properties
diff --git a/logstash_7.17.15/config/logstash-full.yml b/logstash_7.17.16/config/logstash-full.yml
similarity index 100%
copy from logstash_7.17.15/config/logstash-full.yml
copy to logstash_7.17.16/config/logstash-full.yml
diff --git a/logstash_7.17.15/config/pipelines.yml b/logstash_7.17.16/config/pipelines.yml
similarity index 100%
copy from logstash_7.17.15/config/pipelines.yml
copy to logstash_7.17.16/config/pipelines.yml
diff --git a/logstash_7.17.15/env2yaml/env2yaml b/logstash_7.17.16/env2yaml/env2yaml
similarity index 50%
rename from logstash_7.17.15/env2yaml/env2yaml
rename to logstash_7.17.16/env2yaml/env2yaml
index 6badf5d..7519352 100755
Binary files a/logstash_7.17.15/env2yaml/env2yaml and b/logstash_7.17.16/env2yaml/env2yaml differ
diff --git a/logstash_7.17.15/pipeline/default.conf b/logstash_7.17.16/pipeline/default.conf
similarity index 100%
copy from logstash_7.17.15/pipeline/default.conf
copy to logstash_7.17.16/pipeline/default.conf
diff --git a/logstash_8.11.1/Dockerfile b/logstash_8.11.2/Dockerfile
similarity index 90%
copy from logstash_8.11.1/Dockerfile
copy to logstash_8.11.2/Dockerfile
index ab5215d..b83e005 100644
--- a/logstash_8.11.1/Dockerfile
+++ b/logstash_8.11.2/Dockerfile
@@ -25,9 +25,9 @@ RUN groupadd --gid 1000 logstash && \
# Add Logstash itself.
RUN \
-curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.11.1-linux-$(arch).tar.gz | \
+curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.11.2-linux-$(arch).tar.gz | \
tar zxf - -C /usr/share && \
- mv /usr/share/logstash-8.11.1 /usr/share/logstash && \
+ mv /usr/share/logstash-8.11.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 && \
@@ -65,13 +65,13 @@ 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.11.1" \
- org.opencontainers.image.version="8.11.1" \
+ org.label-schema.version="8.11.2" \
+ org.opencontainers.image.version="8.11.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=2023-11-11T08:49:05+00:00 \
-org.opencontainers.image.created=2023-11-11T08:49:05+00:00
+ org.label-schema.build-date=2023-12-05T12:30:34+00:00 \
+org.opencontainers.image.created=2023-12-05T12:30:34+00:00
ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_8.11.1/bin/docker-entrypoint b/logstash_8.11.2/bin/docker-entrypoint
similarity index 100%
copy from logstash_8.11.1/bin/docker-entrypoint
copy to logstash_8.11.2/bin/docker-entrypoint
diff --git a/logstash_8.11.1/config/log4j2.file.properties b/logstash_8.11.2/config/log4j2.file.properties
similarity index 100%
copy from logstash_8.11.1/config/log4j2.file.properties
copy to logstash_8.11.2/config/log4j2.file.properties
diff --git a/logstash_8.11.1/config/log4j2.properties b/logstash_8.11.2/config/log4j2.properties
similarity index 100%
rename from logstash_8.11.1/config/log4j2.properties
rename to logstash_8.11.2/config/log4j2.properties
diff --git a/logstash_8.11.1/config/logstash-full.yml b/logstash_8.11.2/config/logstash-full.yml
similarity index 100%
rename from logstash_8.11.1/config/logstash-full.yml
rename to logstash_8.11.2/config/logstash-full.yml
diff --git a/logstash_8.11.1/config/pipelines.yml b/logstash_8.11.2/config/pipelines.yml
similarity index 100%
rename from logstash_8.11.1/config/pipelines.yml
rename to logstash_8.11.2/config/pipelines.yml
diff --git a/logstash_8.11.1/env2yaml/env2yaml b/logstash_8.11.2/env2yaml/env2yaml
similarity index 100%
copy from logstash_8.11.1/env2yaml/env2yaml
copy to logstash_8.11.2/env2yaml/env2yaml
diff --git a/logstash_8.11.1/pipeline/default.conf b/logstash_8.11.2/pipeline/default.conf
similarity index 100%
rename from logstash_8.11.1/pipeline/default.conf
rename to logstash_8.11.2/pipeline/default.conf
diff --git a/logstash_8.11.1/Dockerfile b/logstash_8.11.3/Dockerfile
similarity index 90%
rename from logstash_8.11.1/Dockerfile
rename to logstash_8.11.3/Dockerfile
index ab5215d..401119a 100644
--- a/logstash_8.11.1/Dockerfile
+++ b/logstash_8.11.3/Dockerfile
@@ -25,9 +25,9 @@ RUN groupadd --gid 1000 logstash && \
# Add Logstash itself.
RUN \
-curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.11.1-linux-$(arch).tar.gz | \
+curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-8.11.3-linux-$(arch).tar.gz | \
tar zxf - -C /usr/share && \
- mv /usr/share/logstash-8.11.1 /usr/share/logstash && \
+ mv /usr/share/logstash-8.11.3 /usr/share/logstash && \
chown --recursive logstash:logstash /usr/share/logstash/ && \
chown -R logstash:root /usr/share/logstash && \
chmod -R g=u /usr/share/logstash && \
@@ -65,13 +65,13 @@ 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.11.1" \
- org.opencontainers.image.version="8.11.1" \
+ org.label-schema.version="8.11.3" \
+ org.opencontainers.image.version="8.11.3" \
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=2023-11-11T08:49:05+00:00 \
-org.opencontainers.image.created=2023-11-11T08:49:05+00:00
+ org.label-schema.build-date=2023-12-07T19:18:05+00:00 \
+org.opencontainers.image.created=2023-12-07T19:18:05+00:00
ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_8.11.1/bin/docker-entrypoint b/logstash_8.11.3/bin/docker-entrypoint
similarity index 100%
rename from logstash_8.11.1/bin/docker-entrypoint
rename to logstash_8.11.3/bin/docker-entrypoint
diff --git a/logstash_8.11.1/config/log4j2.file.properties b/logstash_8.11.3/config/log4j2.file.properties
similarity index 100%
rename from logstash_8.11.1/config/log4j2.file.properties
rename to logstash_8.11.3/config/log4j2.file.properties
diff --git a/logstash_7.17.15/config/log4j2.properties b/logstash_8.11.3/config/log4j2.properties
similarity index 100%
rename from logstash_7.17.15/config/log4j2.properties
rename to logstash_8.11.3/config/log4j2.properties
diff --git a/logstash_7.17.15/config/logstash-full.yml b/logstash_8.11.3/config/logstash-full.yml
similarity index 100%
rename from logstash_7.17.15/config/logstash-full.yml
rename to logstash_8.11.3/config/logstash-full.yml
diff --git a/logstash_7.17.15/config/pipelines.yml b/logstash_8.11.3/config/pipelines.yml
similarity index 100%
rename from logstash_7.17.15/config/pipelines.yml
rename to logstash_8.11.3/config/pipelines.yml
diff --git a/logstash_8.11.1/env2yaml/env2yaml b/logstash_8.11.3/env2yaml/env2yaml
similarity index 47%
rename from logstash_8.11.1/env2yaml/env2yaml
rename to logstash_8.11.3/env2yaml/env2yaml
index 6a2a9e0..0c96a2a 100755
Binary files a/logstash_8.11.1/env2yaml/env2yaml and b/logstash_8.11.3/env2yaml/env2yaml differ
diff --git a/logstash_7.17.15/pipeline/default.conf b/logstash_8.11.3/pipeline/default.conf
similarity index 100%
rename from logstash_7.17.15/pipeline/default.conf
rename to logstash_8.11.3/pipeline/default.confRelevant Maintainers:
|
|
Do we need to open one of these then on every release? I thought there was already some automation in place here @alpar-t? |
What list are you referring to? |
|
@watson wrote:
The "Supported tags" list in the repository overview pages on Docker Hub.
When this PR gets merged and deployed, both 8.11.3 and 8.11.2 will be listed there, since they both appear each repository's bashbrew file. This can create confusion since only 8.11.3 is current and 8.11.2 is only included to backfill it since that version update was previously missed. Once 8.11.2 is built and deployed to Hub, another PR should be created removing that entry from the bashbrew files, which will also remove it from the repository overviews on Docker Hub.
Note that removing these tags from the bashbrew file will not lead to the images being removed from Docker Hub, just that they will be removed from the "supported tags" section of the Docker Hub repository overview. |
I'm not aware of a change that would require us to do so. AFAIK we automatically raise a PR such as elastic/dockerfiles#162 and create a tag such as https://github.com/elastic/dockerfiles/tree/v8.11.2 my understanding is that automation from the docker team takes over from there. Is any of this changing now ? |
|
Yes, the main change in #15808 is that we'll need PRs here for each release (which we needed before too, but we handled those because they were going through our janky https://github.com/docker-library/elasticsearch and friends repositories). However, as I've written these files right now, they're pulling the references from the branches instead of the tags on that Elastic GitHub repository -- I'm not sure if that makes your life any easier (not having to create those tags anymore if you don't want to, which I understand has been a bit of a hassle in the past)? |
|
Thanks for the clarification! I'll make sure to update the release process on our side. |
|
❤️ I think we're good to go 👀 I'll leave the backfilled 8.11.2 for now in case you want to test some automation (so there's a reasonable change that can be made) or practice making the update PR. 👍 ❤️ |
|
Thanks @tianon! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up to #15808
@mark-vieira @watson @jsvd (@alpar-t) this is a good example of what a "bump" PR would gemerally look like (and this one is an extra fun example because it includes a back-fill for the missed 8.11.2 version -- after that's built successfully once, we'll want to remove it from the list so it doesn't show up on Hub in the "supported tags" list)