UNCLASSIFIED

Commit c96eca80 authored by Thomas Runyon's avatar Thomas Runyon
Browse files

update to new elasticsearch version

parent e597b3f0
Pipeline #206195 canceled with stages
ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/opensource/fluentd/fluentd ARG BASE_IMAGE=ironbank/opensource/fluentd/fluentd-elasticsearch
ARG BASE_TAG=1.11.5 ARG BASE_TAG=5.0.0
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...@@ -24,4 +24,4 @@ RUN gem install --force --local -N /tmp/*.gem ...@@ -24,4 +24,4 @@ RUN gem install --force --local -N /tmp/*.gem
RUN yum remove -y make gcc gcc-c++ && dnf clean all && rm /usr/local/bundle/gems/kubeclient-4.6.0/test/config/external-key.rsa RUN yum remove -y make gcc gcc-c++ && dnf clean all && rm /usr/local/bundle/gems/kubeclient-4.6.0/test/config/external-key.rsa
USER fluent USER 1000
...@@ -8,13 +8,13 @@ name: "cluster-auditor/opa-collector" ...@@ -8,13 +8,13 @@ name: "cluster-auditor/opa-collector"
# 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:
- "0.3.1" - "0.3.2"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
args: args:
BASE_IMAGE: "opensource/fluentd/fluentd" BASE_IMAGE: "opensource/fluentd/fluentd-elasticsearch"
BASE_TAG: "1.11.5" BASE_TAG: "5.0.0"
# Docker image labels # Docker image labels
labels: labels:
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://www.openpolicyagent.org/docs/latest/" org.opencontainers.image.url: "https://www.openpolicyagent.org/docs/latest/"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Big Bang" org.opencontainers.image.vendor: "Big Bang"
org.opencontainers.image.version: "0.3.1" org.opencontainers.image.version: "0.3.2"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "bigbang,opa" mil.dso.ironbank.image.keywords: "bigbang,opa"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -97,11 +97,6 @@ resources: ...@@ -97,11 +97,6 @@ resources:
validation: validation:
type: sha256 type: sha256
value: 6c5029e9d7d8b2b295bce33089b4530992d534890b5c737ccfbc16575ff4cc71 value: 6c5029e9d7d8b2b295bce33089b4530992d534890b5c737ccfbc16575ff4cc71
- url: https://rubygems.org/downloads/multi_json-1.14.1.gem
filename: multi_json.gem
validation:
type: sha256
value: d971296c0eacea289d31e4a7ab7ac5eda97262c62bbc8c110de4f5e36425c577
- url: https://rubygems.org/downloads/to_regexp-0.2.1.gem - url: https://rubygems.org/downloads/to_regexp-0.2.1.gem
filename: to_regexp.gem filename: to_regexp.gem
validation: validation:
...@@ -122,31 +117,6 @@ resources: ...@@ -122,31 +117,6 @@ resources:
validation: validation:
type: sha256 type: sha256
value: af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44 value: af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44
- url: https://rubygems.org/downloads/fluent-plugin-elasticsearch-4.1.3.gem
filename: fluent-plugin-elasticsearch.gem
validation:
type: sha256
value: 0095595478cd8197942c1602b908fbee1efa6dd7e36b45ef7080f7a220813af4
- url: https://rubygems.org/downloads/elasticsearch-7.9.0.gem
filename: elasticsearch.gem
validation:
type: sha256
value: 732e155ae080862465cdf80f8ee38771e9bfd1d1b40b428df3c98106875c6ae2
- url: https://rubygems.org/downloads/elasticsearch-api-7.9.0.gem
filename: elasticsearch-api.gem
validation:
type: sha256
value: fff8d1367f54a29e7757182c2c46041c85ebe05abfd2d9c364797413d04d535b
- url: https://rubygems.org/downloads/elasticsearch-transport-7.9.0.gem
filename: elasticsearch-transport.gem
validation:
type: sha256
value: 0af4230c26b18722b1fb792f59597b17faca51b35f7c832d00568973883d88c5
- url: https://rubygems.org/downloads/faraday-1.0.1.gem
filename: faraday.gem
validation:
type: sha256
value: 381aee04fcc9effbe5fa7cc703d8f5f20293722f987ded4f958f77514cd29373
- url: https://rubygems.org/downloads/fluent-plugin-record-modifier-2.1.0.gem - url: https://rubygems.org/downloads/fluent-plugin-record-modifier-2.1.0.gem
filename: fluent-plugin-record-modifier.gem filename: fluent-plugin-record-modifier.gem
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