diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 7df996a5702042a9d2ef04d5d89aba99731e2417..eddb46afc11532914c515d753a07ee47988dbfd3 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -14,7 +14,7 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "opensource/nodejs/nodejs14" - BASE_TAG: "14.17.0" + BASE_TAG: "14.17.3" # Docker image labels labels: diff --git a/renovate.json b/renovate.json index 21d0d6f195e4a8d61d5dbea89e50e177c19f7a6d..dc3d76c548449dba40d1361157e614e458781cfd 100644 --- a/renovate.json +++ b/renovate.json @@ -5,24 +5,16 @@ "baseBranches": [ "development" ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [{ - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "mitre/heimdall2", - "datasourceTemplate": "docker" - }, - { "fileMatch": [ "^hardening_manifest.yaml$" ], "matchStrings": [ - "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + "BASE_TAG:\\s+\"(?.*?)\"" ], - "depNameTemplate": "mitre/heimdall2", + "depNameTemplate": "registry1.dso.mil/ironbank/opensource/nodejs/nodejs14", "datasourceTemplate": "docker" }, { @@ -30,6 +22,7 @@ "^hardening_manifest.yaml$" ], "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"", "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "mitre/heimdall2",