From 116c54544881ebccdc1d286b57b7a065951b00c6 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Wed, 17 May 2023 10:42:10 +0200 Subject: [PATCH] chore: fix Dockerfile location on the last items - fixup of #409 Signed-off-by: Damien Duportal --- .github/dependabot.yml | 8 +++--- updatecli/updatecli.d/git-windows.yml | 16 +++++------ updatecli/updatecli.d/remoting.yaml | 38 +++++++-------------------- 3 files changed, 22 insertions(+), 40 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d5ebaf4ff..878e947ba 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -66,7 +66,7 @@ updates: # Windows - package-ecosystem: docker - directory: "17/windows/nanoserver-1809" + directory: "windows/nanoserver-1809" schedule: interval: weekly open-pull-requests-limit: 2 @@ -77,7 +77,7 @@ updates: - dependencies - package-ecosystem: docker - directory: "17/windows/windowsservercore-ltsc2019" + directory: "windows/windowsservercore-ltsc2019" schedule: interval: weekly open-pull-requests-limit: 2 @@ -88,7 +88,7 @@ updates: - dependencies - package-ecosystem: docker - directory: "11/windows/nanoserver-1809" + directory: "windows/nanoserver-1809" schedule: interval: weekly open-pull-requests-limit: 2 @@ -99,7 +99,7 @@ updates: - dependencies - package-ecosystem: docker - directory: "11/windows/windowsservercore-ltsc2019" + directory: "windows/windowsservercore-ltsc2019" schedule: interval: weekly open-pull-requests-limit: 2 diff --git a/updatecli/updatecli.d/git-windows.yml b/updatecli/updatecli.d/git-windows.yml index 5d3514e8e..b8da6e72d 100644 --- a/updatecli/updatecli.d/git-windows.yml +++ b/updatecli/updatecli.d/git-windows.yml @@ -39,7 +39,7 @@ targets: captureindex: 1 kind: dockerfile spec: - file: 11/windows/nanoserver-1809/Dockerfile + file: windows/nanoserver-1809/Dockerfile instruction: keyword: ARG matcher: GIT_VERSION @@ -52,7 +52,7 @@ targets: captureindex: 2 kind: dockerfile spec: - file: 11/windows/nanoserver-1809/Dockerfile + file: windows/nanoserver-1809/Dockerfile instruction: keyword: ARG matcher: GIT_PATCH_VERSION @@ -66,7 +66,7 @@ targets: captureindex: 1 kind: dockerfile spec: - file: 11/windows/windowsservercore-ltsc2019/Dockerfile + file: windows/windowsservercore-ltsc2019/Dockerfile instruction: keyword: ARG matcher: GIT_VERSION @@ -79,7 +79,7 @@ targets: captureindex: 2 kind: dockerfile spec: - file: 11/windows/windowsservercore-ltsc2019/Dockerfile + file: windows/windowsservercore-ltsc2019/Dockerfile instruction: keyword: ARG matcher: GIT_PATCH_VERSION @@ -93,7 +93,7 @@ targets: captureindex: 1 kind: dockerfile spec: - file: 17/windows/nanoserver-1809/Dockerfile + file: windows/nanoserver-1809/Dockerfile instruction: keyword: ARG matcher: GIT_VERSION @@ -106,7 +106,7 @@ targets: captureindex: 2 kind: dockerfile spec: - file: 17/windows/nanoserver-1809/Dockerfile + file: windows/nanoserver-1809/Dockerfile instruction: keyword: ARG matcher: GIT_PATCH_VERSION @@ -120,7 +120,7 @@ targets: captureindex: 1 kind: dockerfile spec: - file: 17/windows/windowsservercore-ltsc2019/Dockerfile + file: windows/windowsservercore-ltsc2019/Dockerfile instruction: keyword: ARG matcher: GIT_VERSION @@ -133,7 +133,7 @@ targets: captureindex: 2 kind: dockerfile spec: - file: 17/windows/windowsservercore-ltsc2019/Dockerfile + file: windows/windowsservercore-ltsc2019/Dockerfile instruction: keyword: ARG matcher: GIT_PATCH_VERSION diff --git a/updatecli/updatecli.d/remoting.yaml b/updatecli/updatecli.d/remoting.yaml index e2581ea09..59485a0c6 100644 --- a/updatecli/updatecli.d/remoting.yaml +++ b/updatecli/updatecli.d/remoting.yaml @@ -34,29 +34,29 @@ conditions: command: curl --silent --show-error --location --verbose --output /dev/null --fail https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/{{ source "lastVersion" }}/remoting-{{ source "lastVersion" }}.jar targets: - setJdk11AlpineDockerImage: + setAlpineDockerImage: name: Bump the Jenkins remoting version on JDK11 Alpine kind: dockerfile spec: - file: 11/alpine/Dockerfile + file: alpine/Dockerfile instruction: keyword: ARG matcher: VERSION scmid: default - setJdk11ArchlinuxDockerImage: + setArchlinuxDockerImage: name: Bump the Jenkins remoting version on JDK11 Archlinux kind: dockerfile spec: - file: 11/archlinux/Dockerfile + file: archlinux/Dockerfile instruction: keyword: ARG matcher: VERSION scmid: default - setJdk11DebianDockerImage: + setDebianDockerImage: name: Bump the Jenkins remoting version on JDK11 Debian Bullseye kind: dockerfile spec: - file: 11/bullseye/Dockerfile + file: debian/Dockerfile instruction: keyword: ARG matcher: VERSION @@ -65,7 +65,7 @@ targets: name: Bump the Jenkins remoting version on JDK11 Windows Nanoserver 1809 kind: dockerfile spec: - file: 11/windows/nanoserver-1809/Dockerfile + file: windows/nanoserver-1809/Dockerfile instruction: keyword: ARG matcher: VERSION @@ -74,25 +74,7 @@ targets: name: Bump the Jenkins remoting version on JDK11 Windows Server 2019 kind: dockerfile spec: - file: 11/windows/windowsservercore-ltsc2019/Dockerfile - instruction: - keyword: ARG - matcher: VERSION - scmid: default - setJdk17AlpineDockerImage: - name: Bump the Jenkins remoting version on JDK17 Alpine - kind: dockerfile - spec: - file: 17/alpine/Dockerfile - instruction: - keyword: ARG - matcher: VERSION - scmid: default - setJdk17DebianDockerImage: - name: Bump the Jenkins remoting version on JDK17 Debian Bullseye - kind: dockerfile - spec: - file: 17/bullseye/Dockerfile + file: windows/windowsservercore-ltsc2019/Dockerfile instruction: keyword: ARG matcher: VERSION @@ -101,7 +83,7 @@ targets: name: Bump the Jenkins remoting version on JDK17 Windows Nanoserver 1809 kind: dockerfile spec: - file: 17/windows/nanoserver-1809/Dockerfile + file: windows/nanoserver-1809/Dockerfile instruction: keyword: ARG matcher: VERSION @@ -110,7 +92,7 @@ targets: name: Bump the Jenkins remoting version on JDK17 Windows Server 2019 kind: dockerfile spec: - file: 17/windows/windowsservercore-ltsc2019/Dockerfile + file: windows/windowsservercore-ltsc2019/Dockerfile instruction: keyword: ARG matcher: VERSION