UNCLASSIFIED

Commit f530bbee authored by alexander.klepal's avatar alexander.klepal
Browse files

Merge branch 'blake.burkhart-development-patch-14147' into 'development'

Update Dockerfile to be better managed by Renovate

See merge request !18
parents 8552aebe 1bff607e
Pipeline #231121 passed with stages
in 14 minutes and 24 seconds
...@@ -2,14 +2,18 @@ ARG BASE_REGISTRY=registry1.dso.mil ...@@ -2,14 +2,18 @@ ARG BASE_REGISTRY=registry1.dso.mil
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/proxyv2:1.9.3 AS base # Updated by Renovate
ARG version="1.9.3"
FROM istio/proxyv2:${version} AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
# Environment variable indicating the exact proxy sha - for debugging or version-specific configs # Environment variable indicating the exact proxy sha - for debugging or version-specific configs
ENV ISTIO_META_ISTIO_PROXY_SHA=istio-proxy:9ede4aa9d31f9853ef9e61beb69ea9864854e268 # Iron Bank cannot provide a meaningful SHA here, set it to a placeholder value
ENV ISTIO_META_ISTIO_PROXY_SHA=isto-proxy:ironbank
# Environment variable indicating the exact build, for debugging # Environment variable indicating the exact build, for debugging
ENV ISTIO_META_ISTIO_VERSION=1.9.2 ENV ISTIO_META_ISTIO_VERSION=${version}
COPY --from=base /sbin/xtables-multi /sbin/iptables* /sbin/ip6tables* /sbin/ip /sbin/ COPY --from=base /sbin/xtables-multi /sbin/iptables* /sbin/ip6tables* /sbin/ip /sbin/
COPY --from=base /usr/lib/x86_64-linux-gnu/xtables/ /usr/lib/x86_64-linux-gnu/xtables COPY --from=base /usr/lib/x86_64-linux-gnu/xtables/ /usr/lib/x86_64-linux-gnu/xtables
......
...@@ -16,6 +16,16 @@ ...@@ -16,6 +16,16 @@
} }
], ],
"regexManagers": [ "regexManagers": [
{
"fileMatch": [
"^Dockerfile$"
],
"matchStrings": [
"version=\"(?<currentValue>.*?)\""
],
"depNameTemplate": "istio/proxyv2",
"datasourceTemplate": "docker"
},
{ {
"fileMatch": [ "fileMatch": [
"^hardening_manifest.yaml$" "^hardening_manifest.yaml$"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment