diff --git a/Dockerfile b/Dockerfile index 1855f16ca0e784d1670724e92baa6b89cbbe1330..a269967622dcfb3056c0fc168a22676d93842eb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,9 @@ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.6 -FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder -ARG ELASTIC_STACK=7.17.5 +ARG ELASTIC_STACK=7.17.6 ARG ELASTIC_PRODUCT=metricbeat ARG OS_AND_ARCH=linux-x86_64 @@ -26,7 +26,7 @@ RUN tar --strip-components=1 -zxf ${ELASTIC_PRODUCT}-${ELASTIC_STACK}-${OS_AND_A # REF: https://docs.okd.io/latest/openshift_images/create-images.html RUN chmod -R g=u /usr/share/${ELASTIC_PRODUCT} -# Create auxiliar folders and assing default permissions. +# Create auxiliary folders and assigning default permissions. RUN mkdir /usr/share/${ELASTIC_PRODUCT}/data /usr/share/${ELASTIC_PRODUCT}/logs && \ chown -R root:root /usr/share/${ELASTIC_PRODUCT} && \ find /usr/share/${ELASTIC_PRODUCT} -type d -exec chmod 0750 {} \; && \ @@ -49,7 +49,7 @@ COPY tinit /tinit RUN chmod +x /tinit # Bring in product from the initial stage. -COPY --from=prep_files --chown=1000:0 /usr/share/${ELASTIC_PRODUCT} /usr/share/${ELASTIC_PRODUCT} +COPY --from=builder --chown=1000:0 /usr/share/${ELASTIC_PRODUCT} /usr/share/${ELASTIC_PRODUCT} WORKDIR /usr/share/${ELASTIC_PRODUCT} RUN ln -s /usr/share/${ELASTIC_PRODUCT} /opt/${ELASTIC_PRODUCT} diff --git a/README.md b/README.md index a0e37c3d954434644d2a04142f552f75a8fbcd9b..917fab37d9dab19ac4e904ad9a4d21451917012e 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,9 @@ You can learn more about the Elastic Community and also understand how to get mo visiting [Elastic Community](https://www.elastic.co/community). This software is governed by the [Elastic -License](https://github.com/elastic/beats/blob/8.2/licenses/ELASTIC-LICENSE.txt), +License](https://github.com/elastic/beats/blob/7.17/licenses/ELASTIC-LICENSE.txt), 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-8.2.3.html). +[here](https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.17.6.html). diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index fb241bfd9f8d5c41ccb20d530b53ab5f2a38226d..13346624c1761424df717ebf14dfcce4888b7ed8 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,63 +1,40 @@ ---- apiVersion: v1 - -# The repository name in registry1, excluding /ironbank/ -name: "elastic/beats/metricbeat" - -# List of tags to push for the repository in registry1 -# The most specific version should be the first tag and will be shown -# on ironbank.dsop.io -tags: -- "7.17.5" - -# Build args passed to Dockerfile ARGs args: - BASE_IMAGE: "redhat/ubi/ubi8" - BASE_TAG: "8.6" - ELASTIC_STACK: "7.17.5" - ELASTIC_PRODUCT: "metricbeat" - -# Docker image labels + BASE_IMAGE: redhat/ubi/ubi8 + BASE_TAG: '8.6' + ELASTIC_PRODUCT: metricbeat + ELASTIC_STACK: 7.17.6 labels: - org.opencontainers.image.title: "metricbeat" - ## Human-readable description of the software packaged in the image - org.opencontainers.image.description: "metricbeat Lightweight shipper for metrics" - ## License(s) under which contained software is distributed - org.opencontainers.image.licenses: "Elastic License" - ## URL to find more information on the image - org.opencontainers.image.url: "https://www.elastic.co/products/beats/metricbeat" - ## Name of the distributing entity, organization or individual - org.opencontainers.image.vendor: "Elastic" - org.opencontainers.image.version: "7.17.5" - ## Keywords to help with search (ex. "cicd,gitops,golang") - mil.dso.ironbank.image.keywords: "metrics,observabilty,o11y,oblt,beats,elastic,elasticsearch,golang" - ## This value can be "opensource" or "commercial" - mil.dso.ironbank.image.type: "commercial" - ## Product the image belongs to for grouping multiple images - mil.dso.ironbank.product.name: "beats" - -# List of resources to make available to the offline build context + mil.dso.ironbank.image.keywords: metrics,observabilty,o11y,oblt,beats,elastic,elasticsearch,golang + mil.dso.ironbank.image.type: commercial + mil.dso.ironbank.product.name: metricbeat + org.opencontainers.image.description: metricbeat Lightweight shipper for metrics + org.opencontainers.image.licenses: Elastic License + org.opencontainers.image.title: metricbeat + org.opencontainers.image.url: https://www.elastic.co/products/beats/metricbeat + org.opencontainers.image.vendor: Elastic + org.opencontainers.image.version: 7.17.6 +maintainers: +- email: nassim.kammah@elastic.co + name: Nassim Kammah + username: nassim.kammah +- email: ivan.fernandez@elastic.co + name: Ivan Fernandez Calvo + username: ivan.fernandez +- email: victor.martinez@elastic.co + name: Victor Martinez + username: victor.martinez +name: elastic/beats/metricbeat resources: -- filename: metricbeat-7.17.5-linux-x86_64.tar.gz - url: https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-7.17.5-linux-x86_64.tar.gz +- filename: metricbeat-7.17.6-linux-x86_64.tar.gz + url: https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-7.17.6-linux-x86_64.tar.gz validation: type: sha512 - value: 5828739d69d5e1a62f11fbf86bf20dc146bc60f8d37116b07f9122fcaa55707572255ffeca7d8f8507f8d883d0d86d35803f53f74bcad0f4eab3eaac0fd6873a + value: 313a029a7c4b58692d500d11a9436a2c8e6b0d1342142ff39e7647086d339969135cd8282486e49f8a2a91390baa9e4243768872c8f836ed5b668eab979cd2e5 - filename: tinit url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64 validation: type: sha256 value: 93dcc18adc78c65a028a84799ecf8ad40c936fdfc5f2a57b1acda5a8117fa82c - - -# List of project maintainers -maintainers: -- email: "nassim.kammah@elastic.co" - name: "Nassim Kammah" - username: "nassim.kammah" -- email: "ivan.fernandez@elastic.co" - name: "Ivan Fernandez Calvo" - username: "ivan.fernandez" -- email: "victor.martinez@elastic.co" - name: "Victor Martinez Rubio" - username: "victor.martinez" +tags: +- 7.17.6