UNCLASSIFIED

Commit 15727d6f authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

master: bump ubi

See merge request !10
parents f206c88e a7bbff3b
Pipeline #467156 failed with stages
in 17 minutes and 11 seconds
ARG BASE_REGISTRY=registry1.dso.mil 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.4
FROM openpolicyagent/proxy_init:v5 as base FROM openpolicyagent/proxy_init:v5 as base
......
...@@ -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:
......
...@@ -5,17 +5,9 @@ ...@@ -5,17 +5,9 @@
"baseBranches": [ "baseBranches": [
"development" "development"
], ],
"automerge": true,
"gitLabAutomerge": true,
"regexManagers": [ "regexManagers": [
{
"fileMatch": [
"^Dockerfile$"
],
"matchStrings": [
"version=\"(?<currentValue>.*?)\""
],
"depNameTemplate": "openpolicyagent/proxy_init",
"datasourceTemplate": "docker"
},
{ {
"fileMatch": [ "fileMatch": [
"^hardening_manifest.yaml$" "^hardening_manifest.yaml$"
...@@ -37,4 +29,4 @@ ...@@ -37,4 +29,4 @@
"datasourceTemplate": "docker" "datasourceTemplate": "docker"
} }
] ]
} }
\ No newline at end of file
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