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
mixer-1.6
Commits
07d2fe7f
Commit
07d2fe7f
authored
Nov 25, 2020
by
Al Fontaine
Browse files
Merge branch 'development' into 'master'
bump 1.6.14 See merge request
!26
parents
3fb036de
35a29fe4
Pipeline
#171255
failed with stages
in 2 minutes and 55 seconds
Changes
3
Pipelines
116
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 @
07d2fe7f
...
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
...
@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
ARG
BASE_IMAGE=redhat/ubi/ubi8
ARG
BASE_IMAGE=redhat/ubi/ubi8
ARG
BASE_TAG=8.2
ARG
BASE_TAG=8.2
FROM
istio/mixer:1.6.1
3
AS base
FROM
istio/mixer:1.6.1
4
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="mixer" \
...
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="mixer" \
org.opencontainers.image.description="Mixer provides policy controls and telemetry collection." \
org.opencontainers.image.description="Mixer provides policy controls and telemetry collection." \
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.6.1
3
" \
org.opencontainers.image.version="1.6.1
4
" \
maintainer="cht@dsop.io"
maintainer="cht@dsop.io"
COPY
--from=base /usr/local/bin/mixs /usr/local/bin/mixs
COPY
--from=base /usr/local/bin/mixs /usr/local/bin/mixs
...
...
Jenkinsfile
View file @
07d2fe7f
@Library
(
'DCCSCR@master'
)
_
@Library
(
'DCCSCR@master'
)
_
dccscrPipeline
(
version:
"1.6.1
3
"
)
dccscrPipeline
(
version:
"1.6.1
4
"
)
download.yaml
View file @
07d2fe7f
---
---
resources
:
resources
:
-
url
:
"
docker://docker.io/istio/mixer@sha256:
fe2e1ec5807d1cb0171681b8dea303a282f18bce2caca892653f70ec14bb9823
"
-
url
:
"
docker://docker.io/istio/mixer@sha256:
25eb57bab7374565a31e9df7cb2af05692d3a1157bbcaa351b1c9412ba5a1b7d
"
tag
:
"
istio/mixer:1.6.1
3
"
tag
:
"
istio/mixer:1.6.1
4
"
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