UNCLASSIFIED

Commit 6fba6d2e authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'development' into 'master'

master: bump ubi

See merge request !59
parents 4059def0 bbecd482
Pipeline #281043 failed with stages
in 5 minutes and 39 seconds
ARG BASE_REGISTRY=registry1.dsop.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 minio/mc:RELEASE.2021-05-18T03-39-44Z as base FROM minio/mc:RELEASE.2021-05-18T03-39-44Z as base
FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG
RUN dnf update -y && \ RUN dnf update -y && \
dnf clean all && \ dnf clean all && \
rm -rf /var/cache/dnf rm -rf /var/cache/dnf
......
...@@ -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:
......
...@@ -19,17 +19,9 @@ ...@@ -19,17 +19,9 @@
} }
} }
], ],
"automerge": true,
"gitLabAutomerge": true,
"regexManagers": [ "regexManagers": [
{
"fileMatch": [
"^Dockerfile$"
],
"matchStrings": [
"version=\"(?<currentValue>.*?)\""
],
"depNameTemplate": "minio/mc",
"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