Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix Dockerfile location on the last items - fixup of #409 #420

Merged
merged 1 commit into from
May 17, 2023
Merged

chore: fix Dockerfile location on the last items - fixup of #409 #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions updatecli/updatecli.d/git-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
38 changes: 10 additions & 28 deletions updatecli/updatecli.d/remoting.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down