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.

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

Update ELK Images for 7.17.26 #18008

Merged
merged 1 commit into from
Dec 3, 2024

Conversation

vincentDeuschle
Copy link
Contributor

No description provided.

Copy link

github-actions bot commented Dec 3, 2024

Diff for 2790784:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index ef85ed5..02d9ca1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,10 +4,10 @@ GitRepo: https://github.com/elastic/dockerfiles.git
 Directory: elasticsearch
 Builder: buildkit
 
-Tags: 7.17.25
+Tags: 7.17.26
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
-GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
+GitCommit: 833d5513f5561c34542daa1a5f739b7513bf9944
 
 Tags: 8.15.5
 Architectures: amd64, arm64v8
@@ -26,10 +26,10 @@ GitRepo: https://github.com/elastic/dockerfiles.git
 Directory: kibana
 Builder: buildkit
 
-Tags: 7.17.25
+Tags: 7.17.26
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
-GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
+GitCommit: 833d5513f5561c34542daa1a5f739b7513bf9944
 
 Tags: 8.15.5
 Architectures: amd64, arm64v8
@@ -48,10 +48,10 @@ GitRepo: https://github.com/elastic/dockerfiles.git
 Directory: logstash
 Builder: buildkit
 
-Tags: 7.17.25
+Tags: 7.17.26
 Architectures: amd64, arm64v8
 GitFetch: refs/heads/7.17
-GitCommit: 9a2cb64607abe3574f8f1d0fa8b9680798f0e6d9
+GitCommit: 833d5513f5561c34542daa1a5f739b7513bf9944
 
 Tags: 8.15.5
 Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index c4bd337..269beaa 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,9 @@
-elasticsearch:7.17.25
+elasticsearch:7.17.26
 elasticsearch:8.15.5
 elasticsearch:8.16.1
-kibana:7.17.25
+kibana:7.17.26
 kibana:8.15.5
 kibana:8.16.1
-logstash:7.17.25
+logstash:7.17.26
 logstash:8.15.5
 logstash:8.16.1
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c4bd337..269beaa 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,9 @@
-elasticsearch:7.17.25
+elasticsearch:7.17.26
 elasticsearch:8.15.5
 elasticsearch:8.16.1
-kibana:7.17.25
+kibana:7.17.26
 kibana:8.15.5
 kibana:8.16.1
-logstash:7.17.25
+logstash:7.17.26
 logstash:8.15.5
 logstash:8.16.1
diff --git a/elasticsearch_7.17.25/Dockerfile b/elasticsearch_7.17.26/Dockerfile
similarity index 94%
rename from elasticsearch_7.17.25/Dockerfile
rename to elasticsearch_7.17.26/Dockerfile
index 4f493fe..78bc0c5 100644
--- a/elasticsearch_7.17.25/Dockerfile
+++ b/elasticsearch_7.17.26/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.25-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.26-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="2024-10-16T22:06:36.904732810Z" \
+LABEL org.label-schema.build-date="2024-11-28T08:05:55.550508263Z" \
   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="f9b6b57d1d0f76e2d14291c04fb50abeb642cfbf" \
+  org.label-schema.vcs-ref="f40328375bfa289242f942fb3d992032ab662e14" \
   org.label-schema.vcs-url="https://github.com/elastic/elasticsearch" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="7.17.25" \
-  org.opencontainers.image.created="2024-10-16T22:06:36.904732810Z" \
+  org.label-schema.version="7.17.26" \
+  org.opencontainers.image.created="2024-11-28T08:05:55.550508263Z" \
   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="f9b6b57d1d0f76e2d14291c04fb50abeb642cfbf" \
+  org.opencontainers.image.revision="f40328375bfa289242f942fb3d992032ab662e14" \
   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.25"
+  org.opencontainers.image.version="7.17.26"
 
 # 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.25/bin/docker-entrypoint.sh b/elasticsearch_7.17.26/bin/docker-entrypoint.sh
similarity index 100%
rename from elasticsearch_7.17.25/bin/docker-entrypoint.sh
rename to elasticsearch_7.17.26/bin/docker-entrypoint.sh
diff --git a/elasticsearch_7.17.25/bin/docker-openjdk b/elasticsearch_7.17.26/bin/docker-openjdk
similarity index 100%
rename from elasticsearch_7.17.25/bin/docker-openjdk
rename to elasticsearch_7.17.26/bin/docker-openjdk
diff --git a/elasticsearch_7.17.25/config/elasticsearch.yml b/elasticsearch_7.17.26/config/elasticsearch.yml
similarity index 100%
rename from elasticsearch_7.17.25/config/elasticsearch.yml
rename to elasticsearch_7.17.26/config/elasticsearch.yml
diff --git a/elasticsearch_7.17.25/config/log4j2.properties b/elasticsearch_7.17.26/config/log4j2.properties
similarity index 100%
rename from elasticsearch_7.17.25/config/log4j2.properties
rename to elasticsearch_7.17.26/config/log4j2.properties
diff --git a/kibana_7.17.25/Dockerfile b/kibana_7.17.26/Dockerfile
similarity index 92%
rename from kibana_7.17.25/Dockerfile
rename to kibana_7.17.26/Dockerfile
index c9aea95..2fc8d76 100644
--- a/kibana_7.17.25/Dockerfile
+++ b/kibana_7.17.26/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.25-linux-$(arch).tar.gz && \
+     https://artifacts.elastic.co/downloads/kibana/kibana-7.17.26-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-10-16T11:09:06.408Z" \
+LABEL org.label-schema.build-date="2024-11-26T12:11:54.291Z" \
   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="427e9521131a6f5f96fe79fb6d6eca013a5f89f3" \
+  org.label-schema.vcs-ref="2ed05e4a85cb41a24646b02ee9c1b6ab2b0e9cde" \
   org.label-schema.vcs-url="https://github.com/elastic/kibana" \
   org.label-schema.vendor="Elastic" \
-  org.label-schema.version="7.17.25" \
-  org.opencontainers.image.created="2024-10-16T11:09:06.408Z" \
+  org.label-schema.version="7.17.26" \
+  org.opencontainers.image.created="2024-11-26T12:11:54.291Z" \
   org.opencontainers.image.documentation="https://www.elastic.co/guide/en/kibana/reference/index.html" \
   org.opencontainers.image.licenses="Elastic License" \
-  org.opencontainers.image.revision="427e9521131a6f5f96fe79fb6d6eca013a5f89f3" \
+  org.opencontainers.image.revision="2ed05e4a85cb41a24646b02ee9c1b6ab2b0e9cde" \
   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.25"
+  org.opencontainers.image.version="7.17.26"
 
 
 ENTRYPOINT ["/bin/tini", "--"]
diff --git a/kibana_7.17.25/bin/kibana-docker b/kibana_7.17.26/bin/kibana-docker
similarity index 100%
rename from kibana_7.17.25/bin/kibana-docker
rename to kibana_7.17.26/bin/kibana-docker
diff --git a/kibana_7.17.25/config/kibana.yml b/kibana_7.17.26/config/kibana.yml
similarity index 100%
rename from kibana_7.17.25/config/kibana.yml
rename to kibana_7.17.26/config/kibana.yml
diff --git a/logstash_7.17.25/Dockerfile b/logstash_7.17.26/Dockerfile
similarity index 90%
rename from logstash_7.17.25/Dockerfile
rename to logstash_7.17.26/Dockerfile
index 62ad56e..99a9f4f 100644
--- a/logstash_7.17.25/Dockerfile
+++ b/logstash_7.17.26/Dockerfile
@@ -26,9 +26,9 @@ RUN groupadd --gid 1000 logstash && \
 
 # Add Logstash itself.
 RUN \
- curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.25-linux-$(arch).tar.gz | \
+ curl -Lo - https://artifacts.elastic.co/downloads/logstash/logstash-7.17.26-linux-$(arch).tar.gz | \
     tar zxf - -C /usr/share && \
-    mv /usr/share/logstash-7.17.25 /usr/share/logstash && \
+    mv /usr/share/logstash-7.17.26 /usr/share/logstash && \
     chown --recursive logstash:logstash /usr/share/logstash/ && \
     chown -R logstash:root /usr/share/logstash && \
     chmod -R g=u /usr/share/logstash && \
@@ -67,15 +67,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.17.25" \
-  org.opencontainers.image.version="7.17.25" \
+  org.label-schema.version="7.17.26" \
+  org.opencontainers.image.version="7.17.26" \
   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-10-16T08:48:26+00:00 \
-  org.opencontainers.image.created=2024-10-16T08:48:26+00:00
+  org.label-schema.build-date=2024-10-22T09:18:02+00:00 \
+  org.opencontainers.image.created=2024-10-22T09:18:02+00:00
 
 
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint"]
diff --git a/logstash_7.17.25/bin/docker-entrypoint b/logstash_7.17.26/bin/docker-entrypoint
similarity index 100%
rename from logstash_7.17.25/bin/docker-entrypoint
rename to logstash_7.17.26/bin/docker-entrypoint
diff --git a/logstash_7.17.25/config/log4j2.properties b/logstash_7.17.26/config/log4j2.properties
similarity index 100%
rename from logstash_7.17.25/config/log4j2.properties
rename to logstash_7.17.26/config/log4j2.properties
diff --git a/logstash_7.17.25/config/logstash-full.yml b/logstash_7.17.26/config/logstash-full.yml
similarity index 100%
rename from logstash_7.17.25/config/logstash-full.yml
rename to logstash_7.17.26/config/logstash-full.yml
diff --git a/logstash_7.17.25/config/pipelines.yml b/logstash_7.17.26/config/pipelines.yml
similarity index 100%
rename from logstash_7.17.25/config/pipelines.yml
rename to logstash_7.17.26/config/pipelines.yml
diff --git a/logstash_7.17.25/env2yaml/env2yaml b/logstash_7.17.26/env2yaml/env2yaml
similarity index 100%
rename from logstash_7.17.25/env2yaml/env2yaml
rename to logstash_7.17.26/env2yaml/env2yaml
diff --git a/logstash_7.17.25/pipeline/default.conf b/logstash_7.17.26/pipeline/default.conf
similarity index 100%
rename from logstash_7.17.25/pipeline/default.conf
rename to logstash_7.17.26/pipeline/default.conf

Relevant Maintainers:

@yosifkit yosifkit merged commit ee09b8e into docker-library:master Dec 3, 2024
14 checks passed
@tianon
Copy link
Member

tianon commented Dec 3, 2024

#17158 (comment)

#16747 (comment) 👀 (which would help make sure it fails sooner, such that if it fails on our official build infrastructure that might use aggressive build cache that the cache is "busted" in the appropriate place and the rebuild has a chance at success)

To elaborate, it's failing on RUN tar -zxf /tmp/elasticsearch.tar.gz --strip-components=1 (in the Elasticsearch case), meaning the RUN curl line won't be retried on a rebuild attempt on our official infrastructure, so it will just fail indefinitely if we were to have a similar issue with the download there.

Friendly reminder: #16698 (comment) (set -e/set -ux and avoiding arch; curl -fS would be good too, but likely fail in other ways if curl were to fail)

This is good for now, but please do revisit elastic/logstash#16063 (comment) (adding at the very least set -e to all semi-colon-using RUN lines, if not the full set -eux I suggest there).

(We should also apply the same "avoiding arch in favor of querying the image userspace environment" logic to these lines...)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants