Merge pull request #1315 from Vlatombe/remoting-remove-jdk11-suffix

Vlatombe · web-flow · commit 9dbd8a6113f7 · 2023-02-13T10:18:29.000+01:00
Remove jdk11 suffix from inbound-agent to ease matching
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -11,7 +11,7 @@
       "description": "remoting agent uses non-standard versioning",
       "matchDatasources": ["docker"],
       "matchPackageNames": ["jenkins/inbound-agent"],
-      "versioning": "regex:^(?<major>\\d+)\\.(?<minor>[^\\.-]*)(\\.(?<patch>\\d+))?(-(?<build>\\d+))?(-(?<buildtype>[^\\.-]*))?$"
+      "versioning": "regex:^(?<major>\\d+)\\.(?<minor>[^\\.-]*)(\\.(?<patch>\\d+))?(-(?<build>\\d+))?$"
     }
   ],
   "enabledManagers": [
diff --git a/src/main/resources/org/csanchez/jenkins/plugins/kubernetes/Dockerfile b/src/main/resources/org/csanchez/jenkins/plugins/kubernetes/Dockerfile
@@ -1 +1 @@
-FROM jenkins/inbound-agent:3077.vd69cf116da_6f-3-jdk11
+FROM jenkins/inbound-agent:3077.vd69cf116da_6f-3

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"description": "remoting agent uses non-standard versioning",`
`12`	`12`	`"matchDatasources": ["docker"],`
`13`	`13`	`"matchPackageNames": ["jenkins/inbound-agent"],`
`14`		`- "versioning": "regex:^(?<major>\\d+)\\.(?<minor>[^\\.-])(\\.(?<patch>\\d+))?(-(?<build>\\d+))?(-(?<buildtype>[^\\.-]))?$"`
	`14`	`+ "versioning": "regex:^(?<major>\\d+)\\.(?<minor>[^\\.-]*)(\\.(?<patch>\\d+))?(-(?<build>\\d+))?$"`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"enabledManagers": [`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-FROM jenkins/inbound-agent:3077.vd69cf116da_6f-3-jdk11`
	`1`	`+FROM jenkins/inbound-agent:3077.vd69cf116da_6f-3`