UNCLASSIFIED

Skip to content

GitLab

Commit f10eaf2e authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master' 

master: bump v7.14.1

See merge request !28
parents 692df9bf f088bb8c
Pipeline #467055 passed with stages
in 13 minutes and 10 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
Dockerfile
View file @ f10eaf2e
...@@ -8,7 +8,7 @@ ARG BASE_TAG=8.4 ...@@ -8,7 +8,7 @@ ARG BASE_TAG=8.4
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files
ARG ELASTIC_STACK=7.14.0 ARG ELASTIC_STACK=7.14.1
ARG ELASTIC_PRODUCT=elastic-agent ARG ELASTIC_PRODUCT=elastic-agent
ARG OS_AND_ARCH=linux-x86_64 ARG OS_AND_ARCH=linux-x86_64
......
hardening_manifest.yaml
View file @ f10eaf2e
...@@ -8,7 +8,7 @@ name: "elastic/beats/elastic-agent" ...@@ -8,7 +8,7 @@ name: "elastic/beats/elastic-agent"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "7.14.0" - "7.14.1"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -16,7 +16,7 @@ args: ...@@ -16,7 +16,7 @@ args:
BASE_IMAGE: "redhat/ubi/ubi8" BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.4" BASE_TAG: "8.4"
BASE_REGISTRY: registry1.dsop.io BASE_REGISTRY: registry1.dsop.io
ELASTIC_STACK: "7.14.0" ELASTIC_STACK: "7.14.1"
ELASTIC_PRODUCT: "elastic-agent" ELASTIC_PRODUCT: "elastic-agent"
# Docker image labels # Docker image labels
...@@ -30,7 +30,7 @@ labels: ...@@ -30,7 +30,7 @@ labels:
org.opencontainers.image.url: "https://www.elastic.co/products/beats/elastic-agent" org.opencontainers.image.url: "https://www.elastic.co/products/beats/elastic-agent"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Elastic" org.opencontainers.image.vendor: "Elastic"
org.opencontainers.image.version: "7.14.0" org.opencontainers.image.version: "7.14.1"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "log,metrics,monitoring,observabilty,o11y,oblt,beats,elastic,elasticsearch,golang" mil.dso.ironbank.image.keywords: "log,metrics,monitoring,observabilty,o11y,oblt,beats,elastic,elasticsearch,golang"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -40,11 +40,11 @@ labels: ...@@ -40,11 +40,11 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- filename: elastic-agent-7.14.0-linux-x86_64.tar.gz - filename: elastic-agent-7.14.1-linux-x86_64.tar.gz
url: https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-7.14.0-linux-x86_64.tar.gz url: https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-7.14.1-linux-x86_64.tar.gz
validation: validation:
type: sha512 type: sha512
value: 9a39ede873f70b1caf98a426ab11eaccaa1e9127c82ce12db969f37aa0a93557eb3d5d23478ee5bd6cf3acf49753f6519b42b1ad8d4981699da862c01db67890 value: da5a1a6f51cdd9b705f5e581aa44ebdb1269ebddbe80956f7182b9e031d5bdab86c4d2b38372c682eb356e7886b2284c8278130e03f2cc92be6e200c57b1825a
- filename: tinit - filename: tinit
url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64 url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64
validation: validation:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED