UNCLASSIFIED

Commit 31280886 authored by alexander.klepal's avatar alexander.klepal
Browse files

Merge branch '1.13.0' into 'development'

1.13.0

See merge request !28
parents 53dfe6f2 40a34acc
Pipeline #191825 passed with stages
in 34 minutes and 53 seconds
......@@ -2,11 +2,11 @@ ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
ARG BASE_TAG=1.11
FROM apache/nifi:1.12.1 as base
FROM apache/nifi:1.13.0 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
ENV NIFI_VERSION=1.12.1
ENV NIFI_VERSION=1.13.0
ENV NIFI_BASE_DIR=/opt/nifi
ENV NIFI_HOME=${NIFI_BASE_DIR}/nifi-current
ENV NIFI_VERSION_DIR=nifi-${NIFI_VERSION} \
......
......@@ -8,7 +8,7 @@ name: "opensource/apache/nifi"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "1.12.1"
- "1.13.0"
- "latest"
# Build args passed to Dockerfile ARGs
......@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://nifi.apache.org"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Apache"
org.opencontainers.image.version: "1.12.1"
org.opencontainers.image.version: "1.13.0"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "dataflow,processing"
## This value can be "opensource" or "commercial"
......@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context
resources:
- tag: apache/nifi:1.12.1
url: docker://docker.io/apache/nifi@sha256:bf7576ab7ad0bfe38c86be5baa47229d1644287984034dc9d5ff4801c5827115
- tag: apache/nifi:1.13.0
url: docker://docker.io/apache/nifi@sha256:80c554f3f4aa408e3d80360d05f9875ccbab3f8ca8f74df35507163229ae446c
- filename: xmlstarlet.rpm
url: https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/x/xmlstarlet-1.6.1-11.el8.x86_64.rpm
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