From 13e556912c4c7f39e71b4d097babfe1935fc7fbd Mon Sep 17 00:00:00 2001 From: elastic <elastic@submit-ubi-images-to-ironba9fedd456454252cab20c5a7af006ba8a-pod> Date: Tue, 2 May 2023 10:05:30 +0000 Subject: [PATCH 1/3] Update Elastic-Agent to 7.17.10 --- Dockerfile | 6 +++--- README.md | 2 +- hardening_manifest.yaml | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 340ed7f..94abf7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,11 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 -ARG BASE_TAG=8.7 +ARG BASE_TAG=8.6 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files -ARG ELASTIC_STACK=7.17.9 +ARG ELASTIC_STACK=7.17.10 ARG ELASTIC_PRODUCT=elastic-agent ARG OS_AND_ARCH=linux-x86_64 @@ -78,7 +78,7 @@ RUN find /usr/share//elastic-agent/data -type d -exec chmod 0770 {} \; && \ COPY jq /usr/local/bin RUN chown root:root /usr/local/bin/jq && chmod 0755 /usr/local/bin/jq -COPY scripts/docker-entrypoint /usr/local/bin/docker-entrypoint +COPY config/docker-entrypoint /usr/local/bin/docker-entrypoint RUN chmod 755 /usr/local/bin/docker-entrypoint USER ${ELASTIC_PRODUCT} diff --git a/README.md b/README.md index 4bad382..8d85bbf 100644 --- a/README.md +++ b/README.md @@ -40,4 +40,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/beats/libbeat/current/release-notes-7.17.9.html). +[here](https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.17.10.html). diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 6574228..51fb148 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,9 +1,9 @@ apiVersion: v1 args: BASE_IMAGE: redhat/ubi/ubi8 - BASE_TAG: '8.7' + BASE_TAG: '8.6' ELASTIC_PRODUCT: elastic-agent - ELASTIC_STACK: 7.17.9 + ELASTIC_STACK: 7.17.10 labels: mil.dso.ironbank.image.keywords: log,metrics,monitoring,observabilty,o11y,oblt,beats,elastic,elasticsearch,golang mil.dso.ironbank.image.type: commercial @@ -14,7 +14,7 @@ labels: org.opencontainers.image.title: elastic-agent org.opencontainers.image.url: https://www.elastic.co/products/beats/elastic-agent org.opencontainers.image.vendor: Elastic - org.opencontainers.image.version: 7.17.9 + org.opencontainers.image.version: 7.17.10 maintainers: - email: nassim.kammah@elastic.co name: Nassim Kammah @@ -27,11 +27,11 @@ maintainers: username: victor.martinez name: elastic/beats/elastic-agent resources: -- filename: elastic-agent-7.17.9-linux-x86_64.tar.gz - url: https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-7.17.9-linux-x86_64.tar.gz +- filename: elastic-agent-7.17.10-linux-x86_64.tar.gz + url: https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-7.17.10-linux-x86_64.tar.gz validation: type: sha512 - value: fe7576fd02f2ace9ad3cc1f80ac362d9c60855e4981fccb989304dc42209d7211c6bc3ceb9bcf5dea400c10ce9e4e273fcc8d9079b71f99997e6d67ff08ed55c + value: 9ceeaba5a52aba976aeb7db0a747f406c46b7383b9fae4d54226d38927e0152327d812f87a6648412b575e395b746489453759f23108721f182885da5ba50ba1 - filename: tinit url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64 validation: @@ -43,4 +43,4 @@ resources: type: sha256 value: af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44 tags: -- 7.17.9 +- 7.17.10 -- GitLab From 4385ff1ec12dc9b2b824ca2de94f9946ffc6510d Mon Sep 17 00:00:00 2001 From: Ivan Fernandez Calvo <kuisathaverat@gmail.com> Date: Tue, 19 Sep 2023 11:44:52 +0200 Subject: [PATCH 2/3] fix: copy scripts folder to config folder --- config/docker-entrypoint | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 config/docker-entrypoint diff --git a/config/docker-entrypoint b/config/docker-entrypoint new file mode 100644 index 0000000..7ebe217 --- /dev/null +++ b/config/docker-entrypoint @@ -0,0 +1,11 @@ +#!/bin/bash + +set -eo pipefail + +# For information on the possible environment variables that can be passed into the container. Run the following +# command for information on the options that are available. +# +# `./elastic-agent container --help` +# + +elastic-agent container "$@" -- GitLab From 84b640cf6f89f03e02b6d855c6e3edce4fe81c0a Mon Sep 17 00:00:00 2001 From: Ivan Fernandez Calvo <ivan.fernandez@elastic.co> Date: Thu, 28 Sep 2023 10:46:17 +0000 Subject: [PATCH 3/3] fix: use UBI 8.7 --- Dockerfile | 2 +- hardening_manifest.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94abf7d..4f40043 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ################################################################################ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 -ARG BASE_TAG=8.6 +ARG BASE_TAG=8.7 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 51fb148..4c6e708 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,7 +1,7 @@ apiVersion: v1 args: BASE_IMAGE: redhat/ubi/ubi8 - BASE_TAG: '8.6' + BASE_TAG: '8.7' ELASTIC_PRODUCT: elastic-agent ELASTIC_STACK: 7.17.10 labels: -- GitLab