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

Jump to bottom

Added support for building jenkins-ci for next version of debian #262

Closed
wants to merge 2 commits into from
Closed

Added support for building jenkins-ci for next version of debian #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e082727
Added support for building jenkins-ci for next version of debian
ieugen Jun 20, 2023
9707fcb
Update README.md
ieugen Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ The image has several supported configurations, which can be accessed via the fo

`${IMAGE_VERSION}` can be found on the [releases](https://github.com/jenkinsci/docker-ssh-agent/releases) page.

* `latest`, `latest-jdk11`, `jdk11`, `latest-bullseye-jdk11`, `bullseye-jdk11`, `latest-debian-jdk11`, `debian-jdk11`, `${IMAGE_VERSION}`, `${IMAGE_VERSION}-jdk11`, ([Dockerfile](debian/Dockerfile))
* `latest-jdk17`, `jdk17`, `latest-bullseye-jdk17`, `bullseye-jdk17`,`latest-debian-jdk17`, `debian-jdk17`, `${IMAGE_VERSION}-jdk17`, ([Dockerfile](debian/Dockerfile))
* `latest`, `latest-jdk11`, `jdk11`, `latest-bullseye-jdk11`, `bullseye-jdk11`, `latest-bookworm-jdk11`, `bookworm-jdk11`, `latest-debian-jdk11`, `debian-jdk11`, `${IMAGE_VERSION}`, `${IMAGE_VERSION}-jdk11`, ([Dockerfile](debian/Dockerfile))
* `latest-jdk17`, `jdk17`, `latest-bullseye-jdk17`, `bullseye-jdk17`, `latest-bookworm-jdk17`, `bookworm-jdk17`, `latest-debian-jdk17`, `debian-jdk17`, `${IMAGE_VERSION}-jdk17`, ([Dockerfile](debian/Dockerfile))
* `nanoserver-1809`, `nanoserver-ltsc2019`, `nanoserver-1809-jdk11`, `nanoserver-ltsc2019-jdk11`, `${IMAGE_VERSION}-nanoserver-1809`, `${IMAGE_VERSION}-nanoserver-ltsc2019`, `${IMAGE_VERSION}-nanoserver-1809-jdk11`, `${IMAGE_VERSION}-nanoserver-ltsc2019-jdk11` ([Dockerfile](windows/nanoserver-ltsc2019/Dockerfile))
* `windowsservercore-1809`, `windowsservercore-ltsc2019`, `windowsservercore-1809-jdk11`, `windowsservercore-ltsc2019-jdk11`, `${IMAGE_VERSION}-windowsservercore-1809`, `${IMAGE_VERSION}-windowsservercore-ltsc2019`, `${IMAGE_VERSION}-windowsservercore-1809-jdk11`, `${IMAGE_VERSION}-windowsservercore-ltsc2019-jdk11` ([Dockerfile](windows/windowsservercore-ltsc2019/Dockerfile))

Expand Down Expand Up @@ -110,6 +110,8 @@ alpine_jdk11
alpine_jdk17
debian_jdk11
debian_jdk17
debian_next_jdk11
debian_next_jdk17
```

#### Building a specific image
Expand Down Expand Up @@ -167,7 +169,9 @@ make show
"alpine_jdk17",
"alpine_jdk11",
"debian_jdk11",
"debian_jdk17"
"debian_jdk17",
"debian_next_jdk11",
"debian_next_jdk17"
]
}
},
Expand Down
46 changes: 46 additions & 0 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@ group "linux" {
"alpine_jdk11",
"debian_jdk11",
"debian_jdk17",
"debian_next_jdk11",
"debian_next_jdk17",
]
}

group "linux-arm64" {
targets = [
"debian_jdk11",
"debian_jdk17",
"debian_next_jdk11",
"debian_next_jdk17",
]
}

Expand All @@ -24,6 +28,8 @@ group "linux-ppc64le" {
targets = [
"debian_jdk11",
"debian_jdk17",
"debian_next_jdk11",
"debian_next_jdk17",
]
}

Expand Down Expand Up @@ -59,6 +65,14 @@ variable "JAVA17_VERSION" {
default = "17.0.7_7"
}

variable "DEBIAN_RELEASE" {
default = "bullseye-20230522"
}

variable "DEBIAN_NEXT_RELEASE" {
default = "bookworm-20230522"
}

target "alpine_jdk17" {
dockerfile = "alpine/Dockerfile"
context = "."
Expand Down Expand Up @@ -103,6 +117,7 @@ target "debian_jdk11" {
context = "."
args = {
JAVA_VERSION = JAVA11_VERSION
DEBIAN_RELEASE = DEBIAN_RELEASE
}
tags = [
equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}": "",
Expand All @@ -118,11 +133,27 @@ target "debian_jdk11" {
platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"]
}

target "debian_next_jdk11" {
dockerfile = "debian/Dockerfile"
context = "."
args = {
JAVA_VERSION = JAVA11_VERSION
DEBIAN_RELEASE = DEBIAN_NEXT_RELEASE
}
tags = [
equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:bookworm-${VERSION}-jdk11": "",
"${REGISTRY}/${JENKINS_REPO}:bookworm-jdk11",
"${REGISTRY}/${JENKINS_REPO}:latest-bookworm-jdk11",
]
platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/ppc64le"]
}

target "debian_jdk17" {
dockerfile = "debian/Dockerfile"
context = "."
args = {
JAVA_VERSION = JAVA17_VERSION
DEBIAN_RELEASE = DEBIAN_RELEASE
}
tags = [
equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}-jdk17": "",
Expand All @@ -135,3 +166,18 @@ target "debian_jdk17" {
]
platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
}

target "debian_next_jdk17" {
dockerfile = "debian/Dockerfile"
context = "."
args = {
JAVA_VERSION = JAVA17_VERSION
DEBIAN_RELEASE = DEBIAN_NEXT_RELEASE
}
tags = [
equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:bookworm-${VERSION}-jdk17": "",
"${REGISTRY}/${JENKINS_REPO}:bookworm-jdk17",
"${REGISTRY}/${JENKINS_REPO}:latest-bookworm-jdk17",
]
platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
}