UNCLASSIFIED
Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Ironbank Containers
O
Opensource
apache
nifi
Commits
303d884e
Commit
303d884e
authored
Mar 23, 2021
by
Al Fontaine
Browse files
Merge branch 'development' into 'master'
Development See merge request
!33
parents
c57b02da
1f4045d8
Pipeline
#275235
failed with stages
in 28 minutes and 33 seconds
Changes
2
Pipelines
114
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Dockerfile
Dockerfile
+1
-1
hardening_manifest.yaml
hardening_manifest.yaml
+4
-4
No files found.
Dockerfile
View file @
303d884e
...
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dsop.io
...
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dsop.io
ARG
BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
ARG
BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
ARG
BASE_TAG=1.11
ARG
BASE_TAG=1.11
FROM
apache/nifi:1.13.
0
as base
FROM
apache/nifi:1.13.
2
as base
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...
...
hardening_manifest.yaml
View file @
303d884e
...
@@ -8,7 +8,7 @@ name: "opensource/apache/nifi"
...
@@ -8,7 +8,7 @@ name: "opensource/apache/nifi"
# 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
:
-
"
1.13.
0
"
-
"
1.13.
2
"
-
"
latest"
-
"
latest"
# Build args passed to Dockerfile ARGs
# Build args passed to Dockerfile ARGs
...
@@ -27,7 +27,7 @@ labels:
...
@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url
:
"
https://nifi.apache.org"
org.opencontainers.image.url
:
"
https://nifi.apache.org"
## Name of the distributing entity, organization or individual
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor
:
"
Apache"
org.opencontainers.image.vendor
:
"
Apache"
org.opencontainers.image.version
:
"
1.13.
0
"
org.opencontainers.image.version
:
"
1.13.
2
"
## Keywords to help with search (ex. "cicd,gitops,golang")
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords
:
"
dataflow,processing"
mil.dso.ironbank.image.keywords
:
"
dataflow,processing"
## This value can be "opensource" or "commercial"
## This value can be "opensource" or "commercial"
...
@@ -37,8 +37,8 @@ labels:
...
@@ -37,8 +37,8 @@ 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
:
-
tag
:
apache/nifi:1.13.
0
-
tag
:
apache/nifi:1.13.
2
url
:
docker://docker.io/apache/nifi@sha256:
80c554f3f4aa408e3d80360d05f9875ccbab3f8ca8f74df35507163229ae446c
url
:
docker://docker.io/apache/nifi@sha256:
2f4dbbe29ec83d8f43ef36ab07c1e4a139e5c2f75bab538c2bf7ee53d1b93bd7
-
filename
:
xmlstarlet.rpm
-
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
url
:
https://download-ib01.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/x/xmlstarlet-1.6.1-11.el8.x86_64.rpm
validation
:
validation
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment