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
40f7e28d
Commit
40f7e28d
authored
Oct 07, 2020
by
Al Fontaine
Browse files
Merge branch 'development' into 'master'
bump 1.7.3 See merge request
!6
parents
3d92e77b
4f0b5578
Pipeline
#48630
passed with stages
in 29 minutes and 9 seconds
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
Dockerfile
Dockerfile
+2
-2
Jenkinsfile
Jenkinsfile
+1
-1
download.yaml
download.yaml
+2
-2
No files found.
Dockerfile
View file @
40f7e28d
...
@@ -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.2
ARG
BASE_TAG=8.2
FROM
istio/pilot:1.7.
2
AS base
FROM
istio/pilot:1.7.
3
AS base
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
FROM
${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="pilot" \
...
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="pilot" \
org.opencontainers.image.description="Istio Pilot provides traffic management capabilities in the Istio Service mesh." \
org.opencontainers.image.description="Istio Pilot provides traffic management capabilities in the Istio Service mesh." \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.url="https://istio.io" \
org.opencontainers.image.url="https://istio.io" \
org.opencontainers.image.version="1.7.
2
" \
org.opencontainers.image.version="1.7.
3
" \
maintainer="cht@dsop.io"
maintainer="cht@dsop.io"
COPY
--from=base /usr/local/bin/pilot-discovery /usr/local/bin/
COPY
--from=base /usr/local/bin/pilot-discovery /usr/local/bin/
...
...
Jenkinsfile
View file @
40f7e28d
@Library
(
'DCCSCR@master'
)
_
@Library
(
'DCCSCR@master'
)
_
dccscrPipeline
(
version:
"1.7.2"
)
dccscrPipeline
(
version:
"1.7.3"
)
\ No newline at end of file
\ No newline at end of file
download.yaml
View file @
40f7e28d
---
---
resources
:
resources
:
-
url
:
"
docker://docker.io/istio/pilot@sha256:cf40f31bac2605e97b59cba3d358228a6e6e289885862a985f0f5ca6e1176a30"
-
url
:
"
docker://docker.io/istio/pilot@sha256:ba83d2a63ef324eb14128d0804aea5d1170b43ca532823dd186a516d354be610"
tag
:
"
istio/pilot:1.7.2"
tag
:
"
istio/pilot:1.7.3"
\ No newline at end of file
\ No newline at end of file
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