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
Istio-1.7
pilot-1.7
Commits
477dd7a5
Commit
477dd7a5
authored
Mar 09, 2021
by
thomas.shepherd
Browse files
Merge branch 'development' into 'master'
Development to master, version bump See merge request
!22
parents
04f35d86
2ba8fb78
Pipeline
#192963
failed with stages
in 3 minutes and 36 seconds
Changes
2
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
Dockerfile
Dockerfile
+1
-1
hardening_manifest.yaml
hardening_manifest.yaml
+4
-8
No files found.
Dockerfile
View file @
477dd7a5
...
@@ -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/ubi/ubi8
ARG
BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG
BASE_TAG=8.3
ARG
BASE_TAG=8.3
FROM
istio/pilot:1.7.
7
AS base
FROM
istio/pilot:1.7.
8
AS base
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...
...
hardening_manifest.yaml
View file @
477dd7a5
...
@@ -8,7 +8,7 @@ name: "opensource/istio-1.7/pilot-1.7"
...
@@ -8,7 +8,7 @@ name: "opensource/istio-1.7/pilot-1.7"
# 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.7.
7
"
-
"
1.7.
8
"
-
"
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://istio.io/"
org.opencontainers.image.url
:
"
https://istio.io/"
## Name of the distributing entity, organization or individual
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor
:
"
opensource"
org.opencontainers.image.vendor
:
"
opensource"
org.opencontainers.image.version
:
"
1.7.
7
"
org.opencontainers.image.version
:
"
1.7.
8
"
## Keywords to help with search (ex. "cicd,gitops,golang")
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords
:
"
istio"
mil.dso.ironbank.image.keywords
:
"
istio"
## 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
:
istio/pilot:1.7.
7
-
tag
:
istio/pilot:1.7.
8
url
:
docker://docker.io/istio/pilot@sha256:
9a84860fdc2bd8bff1a5e97dba82b1b76f9f326e7b4c47191f57853443a9f0a
e
url
:
docker://docker.io/istio/pilot@sha256:
23ade0c166918383df72922f06c7b7b98310d7a9e7a2b4bb3afb7bea402c1d3
e
# List of project maintainers
# List of project maintainers
# FIXME: Fill in the following details for the current container owner in the whitelist
# FIXME: Fill in the following details for the current container owner in the whitelist
...
@@ -51,7 +51,3 @@ maintainers:
...
@@ -51,7 +51,3 @@ maintainers:
name
:
"
Alexander
Klepal"
name
:
"
Alexander
Klepal"
username
:
"
alexander.klepal"
username
:
"
alexander.klepal"
cht_member
:
true
cht_member
:
true
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