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.6
install-cni-1.6
Commits
722d8325
Commit
722d8325
authored
May 20, 2021
by
sean.melissari
Browse files
Merge branch 'bump-ubi-8-4' into 'development'
bump ubi See merge request
!28
parents
b01adadc
ca80142b
Pipeline
#269905
passed with stages
in 9 minutes and 20 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
Dockerfile
Dockerfile
+3
-4
hardening_manifest.yaml
hardening_manifest.yaml
+1
-1
No files found.
Dockerfile
View file @
722d8325
ARG
BASE_REGISTRY=registry1.dso
p.io
ARG
BASE_REGISTRY=registry1.dso
.mil
ARG
BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG
BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG
BASE_TAG=
8.2
ARG
BASE_TAG=
latest
FROM
istio/install-cni:1.6.14 AS base
FROM
istio/install-cni:1.6.14 AS base
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
COPY
--from=base /opt/cni/bin/istio-cni /opt/cni/bin/istio-iptables.sh /opt/cni/bin/istio-cni-repair /opt/cni/bin/
COPY
--from=base /opt/cni/bin/istio-cni /opt/cni/bin/istio-iptables.sh /opt/cni/bin/istio-cni-repair /opt/cni/bin/
COPY
--from=base /install-cni.sh /filter.jq /
COPY
--from=base /install-cni.sh /filter.jq /
COPY
--from=base /istio-cni.conf.tmp host/etc/cni/net.d/
COPY
--from=base /istio-cni.conf.tmp host/etc/cni/net.d/
...
@@ -25,4 +24,4 @@ USER 1001
...
@@ -25,4 +24,4 @@ USER 1001
###############################################################
###############################################################
HEALTHCHECK
--interval=1m --start-period=30s CMD curl -f http://localhost:80 || exit 1
HEALTHCHECK
--interval=1m --start-period=30s CMD curl -f http://localhost:80 || exit 1
###############################################################
###############################################################
CMD
["/install-cni.sh"]
CMD
["/install-cni.sh"]
\ No newline at end of file
hardening_manifest.yaml
View file @
722d8325
...
@@ -14,7 +14,7 @@ tags:
...
@@ -14,7 +14,7 @@ tags:
# Build args passed to Dockerfile ARGs
# Build args passed to Dockerfile ARGs
args
:
args
:
BASE_IMAGE
:
"
redhat/ubi/ubi8"
BASE_IMAGE
:
"
redhat/ubi/ubi8"
BASE_TAG
:
"
8.
3
"
BASE_TAG
:
"
8.
4
"
# Docker image labels
# Docker image labels
labels
:
labels
:
...
...
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