Merge branch 'resolve-cve' into 'development'

update base container

See merge request !17

Dockerfile

 ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8-minimal
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4
 
 FROM hadolint/hadolint:v2.4.0 AS base
 
@@ -13,4 +13,4 @@ RUN microdnf update --nodocs && \
 COPY --from=base /bin/hadolint /usr/bin/hadolint
 USER 1000
 HEALTHCHECK NONE
-ENTRYPOINT ["hadolint"]
+ENTRYPOINT ["hadolint"]
\ No newline at end of file

hardening_manifest.yaml

@@ -10,7 +10,7 @@ tags:
 
 args:
   BASE_IMAGE: "redhat/ubi/ubi8-minimal"
-  BASE_TAG: "8.3"
+  BASE_TAG: "8.4"
 
 labels:
   org.opencontainers.image.title: "hadolint"

renovate.json

+{
+  "extends": ["config:base"],
+  "baseBranches": ["development"],
+  "regexManagers": [
+    {
+      "fileMatch": ["^hardening_manifest.yaml$"],
+      "matchStrings": [
+        "tags:\\s+-\\s+\"(?<currentValue>.+?)\"",
+        "tag: .*:(?<currentValue>.*?)$",
+        "org\\.opencontainers\\.image\\.version:\\s+\"(?<currentValue>.+?)\"",
+        "url: docker://.*@(?<currentDigest>sha256:[a-f0-9]+)"
+      ],
+      "depNameTemplate": "hadolint/hadolint",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": ["^hardening_manifest.yaml$", "^Dockerfile$"],
+      "matchStrings": [
+        "BASE_TAG: \"(?<currentValue>.*?)\"",
+        "BASE_TAG=(?<currentValue>.*?)$"
+      ],
+      "depNameTemplate": "registry1.dso.mil/ironbank/redhat/ubi/ubi8-minimal",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}

renovate.json5

-{
-  extends: ["config:base"],
-  baseBranches: ["development"],
-  regexManagers: [
-    // tool image updates
-    {
-      fileMatch: ["^hardening_manifest.yaml$"],
-      matchStrings: [
-        'tags:\\s+-\\s+"(?<currentValue>.+?)"',
-        "tag: .*:(?<currentValue>.*?)$",
-        'org\\.opencontainers\\.image\\.version:\\s+"(?<currentValue>.+?)"',
-        "url: docker://.*@(?<currentDigest>sha256:[a-f0-9]+)",
-      ],
-      depNameTemplate: "hadolint/hadolint",
-      datasourceTemplate: "docker",
-    },
-    // base image updating
-    {
-      fileMatch: ["^hardening_manifest.yaml$$", "^Dockerfile$"],
-      matchStrings: [
-        'BASE_TAG: "(?<currentValue>.*?)"',
-        "BASE_TAG=(?<currentValue>.*?)$",
-      ],
-      depNameTemplate: "registry1.dso.mil/ironbank/redhat/ubi/ubi8-minimal",
-      datasourceTemplate: "docker",
-    },
-  ],
-  // group our dependencies in one MR as the base image and code image are likely to update at different times
-  groupName: "all dependencies",
-  separateMajorMinor: false,
-  groupSlug: "all",
-  packageRules: [
-    {
-      matchPackagePatterns: ["*"],
-      groupName: "all dependencies",
-      groupSlug: "all",
-    },
-  ],
-}