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.

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: keep only one Dockerfile per Linux image variant #1857

Merged
merged 25 commits into from
May 6, 2024

Conversation

lemeurherve
Copy link
Member

@lemeurherve lemeurherve commented Apr 24, 2024

This PR simplifies this repo content by keeping only one Dockerfile per Linux image variant like the Windows images, versus one per JDK and per Linux image variant currently.

Notes:

For the record, initial image content changes extracted to other merged pull requests:

I'll create a follow-up pull request to adapt updatecli manifests to these changes. (Preview: 65353f9)

This PR is a first step, I'd like to factorize a bit the logic of the docker bake around jdk versions after that.

Testing done

Local builds + CI

Submitter checklist

mkdir almalinux
git mv 11/almalinux/* almalinux
mkdir rhel
git mv 11/rhel/* rhel

for flavor in alpine debian rhel
do
    mkdir -p "${flavor}"
    git mv 17/"${flavor}"/* "${flavor}"
done
// no jdk17, containing now only empty folders, invisible to git
for jdk in 11 21
do
    git rm -r "${jdk}"
done
@lemeurherve lemeurherve marked this pull request as ready for review April 24, 2024 10:47
Copy link
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Started to review this change. It is really good work.

I'm having mixed feeling, for the jlink about the --compress factorization you made with an ARG while keeping a condition around JDK11 or JDK17+ around the debug flags. Without looking at the original code where this comes from, I find it really confusing to have the jlink flags setups spread between a shell instruction inside a Dockerfile and a docker-bake declarative directive.

I would either move all the "varying per JDK" flags as an ARG or all in a shell instruction (and factorize this "hard to read" shell into a separated shell script so we can really factorize).

@lemeurherve
Copy link
Member Author

lemeurherve commented Apr 24, 2024

Addressed spread in b8ff4f7 and e672c5c with minimal complexity.

Not sure putting this into a separate script is mandatory for this PR.

lemeurherve added a commit to lemeurherve/docker that referenced this pull request Apr 24, 2024
@olivergondza
Copy link
Member

On behalf of rhel images, I can say I do not object, as the matrix of versions and jdks remain unchanged. Added one question/suggestion.

# the compression argument is different for JDK21
"11."*) set -- "--strip-debug" "--compress=2" ;; \
"21."*) set -- "--strip-java-debug-attributes" "--compress=zip-6" ;; \
*) set -- "--strip-java-debug-attributes" "--compress=2" ;; \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Q: Why is this using set -- ...?
IIUC, it requires every branch to set the same amount of arguments so they can be referred to as $1 and $2 — that feels hard to obey going forwards. Using an array variable seems to do the trick without being as cryptic, and permitting varying argument count.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alas on Alpine Linux, the shell is ash which does not support arrays.

The set -- ... syntax is a way to simulate arrays. The code could be enforced to ensure the same amount of flags is provided, but what would be the probability of such an error? (I really have no idea)

Copy link
Member Author

@lemeurherve lemeurherve Apr 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of set instead of arrays like in https://github.com/jenkinsci/docker/pull/1857/files#diff-e65ec3bff5dbf5186d16b4f5630439bbe16f82258447f5f212ad42e4ac897e60R28-R33 is motivated by the fact that Alpine ash shell (amongst others) doesn't support them.
Ref: https://github.com/koalaman/shellcheck/wiki/SC3054

Thus using a POSIX shell compliant version of the same script everywhere seems better to me than having a distinct one for Alpine.
I could be wrong but I don't foresee a lot of new jlink arguments. If so this could be revised at that time in my opinion.

EDIT to add that this script and these arguments aren't reused elsewhere than in this intermediate layer and that it isn't directly actionable from an end user perspective.

Copy link
Contributor

@MarkEWaite MarkEWaite left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Initial review started but not finished.

--no-header-files \
--compress=2 \
--output /javaruntime
RUN if test "${TARGETPLATFORM}" != 'linux/arm/v7'; then \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should attempt to preserve armv7 support since Eclipse Temurin does not offer armv7 support.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should attempt to preserve armv7 support since Eclipse Temurin does not offer armv7 support.

Might worth adding it to the Platform SIG for docker agent images?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll remove it.

Removed in 91048d2

@lemeurherve
Copy link
Member Author

lemeurherve commented Apr 30, 2024

Opened #1857 & #1864 if the minor image changes of this PR need to be merged separately.

EDIT: merged.

lemeurherve added a commit to lemeurherve/docker that referenced this pull request May 3, 2024
Copy link
Contributor

@MarkEWaite MarkEWaite left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I compared the list of files in the container images before and after this change and the differences all seemed reasonable to me. I think it is ready to merge.

@MarkEWaite MarkEWaite merged commit e8d146c into jenkinsci:master May 6, 2024
17 checks passed
@lemeurherve lemeurherve deleted the factorize-linux-dockerfile branch May 6, 2024 06:21
MarkEWaite added a commit to MarkEWaite/docker that referenced this pull request May 13, 2024
Earlier refactoring improved the Dockerfiles to have much less duplication.

* jenkinsci#1857
MarkEWaite added a commit that referenced this pull request May 13, 2024
Earlier refactoring improved the Dockerfiles to have much less duplication.

* #1857
ti-chi-bot bot referenced this pull request in PingCAP-QE/ee-ops Aug 5, 2024
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [jenkins/jenkins](https://www.jenkins.io/)
([source](https://github.com/jenkinsci/docker)) | minor |
`2.426.2-lts` -> `2.452.3-lts` |

---

### Release Notes

<details>
<summary>jenkinsci/docker (jenkins/jenkins)</summary>

###
[`v2.452.3`](https://github.com/jenkinsci/docker/releases/tag/2.452.3)

[Compare
Source](https://github.com/jenkinsci/docker/compare/2.452.2...2.452.3)

#### What's Changed

- Remove Java 11 images on weekly release line by
[@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1891](https://github.com/jenkinsci/docker/pull/1891)
- hotfix(updatecli): adapt jdk manifests to also target
build-windows-lts-with-jdk11.yaml by
[@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1892](https://github.com/jenkinsci/docker/pull/1892)
- Bump Debian Bookworm Linux Version to
[`2024061`](https://github.com/jenkinsci/docker/commit/20240612) by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1893](https://github.com/jenkinsci/docker/pull/1893)
- chore(deps): bump ubi9/ubi from 9.4-947.1717074712 to 9.4-1123 in
/rhel/ubi9/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1895](https://github.com/jenkinsci/docker/pull/1895)
- chore(deps): bump updatecli/updatecli-action from 2.59.0 to 2.60.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1897](https://github.com/jenkinsci/docker/pull/1897)
- chore(deps): bump updatecli/updatecli-action from 2.60.0 to 2.61.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1898](https://github.com/jenkinsci/docker/pull/1898)
- Bump Alpine Linux Version to 3.20.1 by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1899](https://github.com/jenkinsci/docker/pull/1899)
- Use 'ENV variable=xxx' instead of 'ENV variable xxx' by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1900](https://github.com/jenkinsci/docker/pull/1900)
- chore(deps): bump ubi9/ubi from 9.4-1123 to 9.4-1123.1719560047 in
/rhel/ubi9/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1901](https://github.com/jenkinsci/docker/pull/1901)
- chore(deps): bump ubi8/ubi from 8.10-901.1717584420 to 8.10-1020 in
/rhel/ubi8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1902](https://github.com/jenkinsci/docker/pull/1902)
- Bump Debian Bookworm Linux Version to
[`2024070`](https://github.com/jenkinsci/docker/commit/20240701) by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1903](https://github.com/jenkinsci/docker/pull/1903)

**Full Changelog**:
jenkinsci/docker@2.452.2...2.452.3

###
[`v2.452.2`](https://github.com/jenkinsci/docker/releases/tag/2.452.2)

[Compare
Source](https://github.com/jenkinsci/docker/compare/2.452.1...2.452.2)

#### 📦 Jenkins Core updates

- Update to Jenkins 2.452.2
([changelog](https://jenkins.io/changelog-stable/2.452.2))

#### 📦 Dependency updates

- Bump Alpine Linux Version to 3.20.0 by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1881](https://github.com/jenkinsci/docker/pull/1881)
- chore(deps): bump ubi8/ubi from 8.9-1160.1715068735 to 8.10-901 in
/rhel/ubi8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1882](https://github.com/jenkinsci/docker/pull/1882)
- chore(deps): bump updatecli/updatecli-action from 2.58.0 to 2.59.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1883](https://github.com/jenkinsci/docker/pull/1883)
- chore(deps): bump almalinux from 8.9 to 8.10 in
/almalinux/almalinux8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1884](https://github.com/jenkinsci/docker/pull/1884)
- chore(deps): bump ubi9/ubi from 9.4-947.1714667021 to
9.4-947.1716476138 in /rhel/ubi9/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1885](https://github.com/jenkinsci/docker/pull/1885)
- chore(deps): bump ubi8/ubi from 8.10-901 to 8.10-901.1716482497 in
/rhel/ubi8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1886](https://github.com/jenkinsci/docker/pull/1886)
- chore(deps): bump ubi8/ubi from 8.10-901.1716482497 to
8.10-901.1716497712 in /rhel/ubi8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1887](https://github.com/jenkinsci/docker/pull/1887)
- chore(deps): bump ubi8/ubi from 8.10-901.1716497712 to
8.10-901.1717584420 in /rhel/ubi8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1888](https://github.com/jenkinsci/docker/pull/1888)
- chore(deps): bump ubi9/ubi from 9.4-947.1716476138 to
9.4-947.1717074712 in /rhel/ubi9/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1889](https://github.com/jenkinsci/docker/pull/1889)

**Full Changelog**:
jenkinsci/docker@2.452.1...2.452.2

###
[`v2.452.1`](https://github.com/jenkinsci/docker/releases/tag/2.452.1)

[Compare
Source](https://github.com/jenkinsci/docker/compare/2.440.3...2.452.1)

#### 📦 Jenkins Core updates

- Update to Jenkins 2.452.1
([changelog](https://jenkins.io/changelog-stable/2.452.1))

#### 📦 Dependency updates

- chore(linux): Switch from Temurin base images to Temurin JDK binaries
by [@&#8203;gounthar](https://github.com/gounthar) in
[https://github.com/jenkinsci/docker/pull/1847](https://github.com/jenkinsci/docker/pull/1847)
- chore(windows): Switch from Temurin base images to Temurin JDK
binaries by [@&#8203;gounthar](https://github.com/gounthar) in
[https://github.com/jenkinsci/docker/pull/1848](https://github.com/jenkinsci/docker/pull/1848)
- Bump Debian Bookworm Linux Version to
[`2024051`](https://github.com/jenkinsci/docker/commit/20240513)
([#&#8203;1879](https://github.com/jenkinsci/docker/issues/1879))
[@&#8203;github-actions](https://github.com/github-actions)
- chore(deps): bump ubi8/ubi from 8.9-1160 to 8.9-1160.1715068735 in
/rhel/ubi8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1877](https://github.com/jenkinsci/docker/pull/1877)
- chore(deps): bump ubi9/ubi from 9.3-1610 to 9.4-947 in
/17/rhel/ubi9/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1872](https://github.com/jenkinsci/docker/pull/1872)
- Bump JDK17 version to 17.0.11\_9 by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1853](https://github.com/jenkinsci/docker/pull/1853)
and
[https://github.com/jenkinsci/docker/pull/1855](https://github.com/jenkinsci/docker/pull/1855)
- Bump JDK21 version to 21.0.3\_9 by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1854](https://github.com/jenkinsci/docker/pull/1854)
and
[https://github.com/jenkinsci/docker/pull/1856](https://github.com/jenkinsci/docker/pull/1856)
- Bump JDK11 version to 11.0.23\_9 by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1860](https://github.com/jenkinsci/docker/pull/1860)
- chore(deps): bump plugin manager to 2.13.0 by
[@&#8203;jenkins-dependency-updater](https://github.com/jenkins-dependency-updater)
in
[https://github.com/jenkinsci/docker/pull/1874](https://github.com/jenkinsci/docker/pull/1874)
- chore(deps): bump updatecli/updatecli-action to 2.58.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1875](https://github.com/jenkinsci/docker/pull/1875)

#### 👻 Maintenance

- chore(updatecli): Check the validity of releases thanks to the
Adoptium API. by [@&#8203;gounthar](https://github.com/gounthar) in
[https://github.com/jenkinsci/docker/pull/1851](https://github.com/jenkinsci/docker/pull/1851)
- chore(updatecli): adapt manifests to unique Dockerfile per Linux
variant by [@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1873](https://github.com/jenkinsci/docker/pull/1873)
- Use correct Dockerfiles in dependabot by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1876](https://github.com/jenkinsci/docker/pull/1876)
- Check for Windows JDK releases, same as Linux by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1852](https://github.com/jenkinsci/docker/pull/1852)
- Track Java versions for Windows with updatecli by
[@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1781](https://github.com/jenkinsci/docker/pull/1781)
- chore(updatecli): add manifests for hadolint & shellcheck in tools
scripts by [@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1858](https://github.com/jenkinsci/docker/pull/1858)
- Bump `shellcheck` version to 0.10.0 by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1861](https://github.com/jenkinsci/docker/pull/1861)
- cleanup: remove deprecated `install-plugin.sh` script from Linux jdk11
images by [@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1863](https://github.com/jenkinsci/docker/pull/1863)
- fix: set jlink compression arg to `zip-6` for Windows jdk21 image by
[@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1864](https://github.com/jenkinsci/docker/pull/1864)
- Use permanent changelog location and default to weekly by
[@&#8203;timja](https://github.com/timja) in
[https://github.com/jenkinsci/docker/pull/1865](https://github.com/jenkinsci/docker/pull/1865)
- Verify SHA256 checksum of plugin installation manager tool by
[@&#8203;basil](https://github.com/basil) in
[https://github.com/jenkinsci/docker/pull/1868](https://github.com/jenkinsci/docker/pull/1868)
- cleanup: remove unused `.ci/common-functions.sh` script by
[@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1869](https://github.com/jenkinsci/docker/pull/1869)
- chore: keep only one Dockerfile per Linux image variant by
[@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1857](https://github.com/jenkinsci/docker/pull/1857)

**Full Changelog**:
jenkinsci/docker@2.440.3...2.452.1

###
[`v2.440.3`](https://github.com/jenkinsci/docker/releases/tag/2.440.3)

[Compare
Source](https://github.com/jenkinsci/docker/compare/2.440.2...2.440.3)

#### 📦 Jenkins Core updates

- Update to Jenkins 2.440.3
([changelog](https://jenkins.io/changelog-stable/2.440.3))

#### 👻 Maintenance

- fix(windows): remove `ConvertFrom-Json` issue by simplifying tags
management by [@&#8203;lemeurherve](https://github.com/lemeurherve) in
[https://github.com/jenkinsci/docker/pull/1841](https://github.com/jenkinsci/docker/pull/1841)

#### 📦 Dependency updates

- chore(deps): bump ubi8/ubi from 8.9-1136 to 8.9-1160 in
/11/rhel/ubi8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1845](https://github.com/jenkinsci/docker/pull/1845)
- Bump Debian Bookworm Linux Version to
[`2024040`](https://github.com/jenkinsci/docker/commit/20240408) by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1846](https://github.com/jenkinsci/docker/pull/1846)

**Full Changelog**:
jenkinsci/docker@2.440.2...2.440.3

###
[`v2.440.2`](https://github.com/jenkinsci/docker/releases/tag/2.440.2)

[Compare
Source](https://github.com/jenkinsci/docker/compare/2.440.1...2.440.2)

#### 📦 Jenkins Core updates

- Update to Jenkins 2.440.2
([changelog](https://jenkins.io/changelog-stable/2.440.2))

#### 👻 Maintenance

- Remove JDK 19 from updatecli script
([#&#8203;1836](https://github.com/jenkinsci/docker/issues/1836))
[@&#8203;MarkEWaite](https://github.com/MarkEWaite)

#### 📦 Dependency updates

- Bump Debian Bookworm Linux Version to
[`2024031`](https://github.com/jenkinsci/docker/commit/20240311)
([#&#8203;1839](https://github.com/jenkinsci/docker/issues/1839))
[@&#8203;github-actions](https://github.com/github-actions)
- chore(deps): bump ubi9/ubi from 9.3-1552 to 9.3-1610 in
/17/rhel/ubi9/hotspot
([#&#8203;1837](https://github.com/jenkinsci/docker/issues/1837))
[@&#8203;dependabot](https://github.com/dependabot)

###
[`v2.440.1`](https://github.com/jenkinsci/docker/releases/tag/2.440.1)

[Compare
Source](https://github.com/jenkinsci/docker/compare/2.426.3...2.440.1)

#### 📦 Jenkins Core updates

- Update to Jenkins 2.440.1
([changelog](https://jenkins.io/changelog-stable/#v2.440.1))

#### What's Changed

- chore(deps): bump ubi9/ubi from 9.3-1476 to 9.3-1552 in
/17/rhel/ubi9/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1812](https://github.com/jenkinsci/docker/pull/1812)
- Use latest Java releases by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1810](https://github.com/jenkinsci/docker/pull/1810)
- chore(deps): bump updatecli/updatecli-action from 2.53.0 to 2.54.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1813](https://github.com/jenkinsci/docker/pull/1813)
- Remove updatecli ref to non-existent file by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1814](https://github.com/jenkinsci/docker/pull/1814)
- Bump Alpine Linux Version to 3.19.1 by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1815](https://github.com/jenkinsci/docker/pull/1815)
- Only run actions from jenkinsci org by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1809](https://github.com/jenkinsci/docker/pull/1809)
- Use Alpine 3.19.1, no 3.18.4 for Java 17 container default by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1816](https://github.com/jenkinsci/docker/pull/1816)
- Remove install-plugins.sh from ubi9 Java 17 and Java 21 by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1817](https://github.com/jenkinsci/docker/pull/1817)
- Use consistent jlink args within Java versions by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1818](https://github.com/jenkinsci/docker/pull/1818)
- Reduce diffs between similar files by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1819](https://github.com/jenkinsci/docker/pull/1819)
- Add Java 21 Windows container by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1820](https://github.com/jenkinsci/docker/pull/1820)
- Use Jenkins 2.442 as default version by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1821](https://github.com/jenkinsci/docker/pull/1821)
- Remove ppc64le jdk21-preview images, add jdk21 image by
[@&#8203;ksalerno99](https://github.com/ksalerno99) in
[https://github.com/jenkinsci/docker/pull/1823](https://github.com/jenkinsci/docker/pull/1823)
- chore(deps): bump plugin manager to 2.12.15 by
[@&#8203;jenkins-dependency-updater](https://github.com/jenkins-dependency-updater)
in
[https://github.com/jenkinsci/docker/pull/1824](https://github.com/jenkinsci/docker/pull/1824)
- Bump Debian Bookworm Linux Version to
[`2024013`](https://github.com/jenkinsci/docker/commit/20240130) by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1825](https://github.com/jenkinsci/docker/pull/1825)
- chore(deps): bump release-drafter/release-drafter from 5 to 6 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1827](https://github.com/jenkinsci/docker/pull/1827)
- Replace Java 21 previews with released versions by
[@&#8203;MarkEWaite](https://github.com/MarkEWaite) in
[https://github.com/jenkinsci/docker/pull/1822](https://github.com/jenkinsci/docker/pull/1822)
- chore(deps): bump ubi8/ubi from 8.9-1107.1705420509 to
8.9-1107.1706791207 in /11/rhel/ubi8/hotspot by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1826](https://github.com/jenkinsci/docker/pull/1826)
- chore(deps): bump peter-evans/create-pull-request from 5 to 6 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1828](https://github.com/jenkinsci/docker/pull/1828)
- Bump Debian Bookworm Linux Version to
[`2024021`](https://github.com/jenkinsci/docker/commit/20240211) by
[@&#8203;github-actions](https://github.com/github-actions) in
[https://github.com/jenkinsci/docker/pull/1830](https://github.com/jenkinsci/docker/pull/1830)
- chore(deps): bump updatecli/updatecli-action from 2.54.0 to 2.55.0 by
[@&#8203;dependabot](https://github.com/dependabot) in
[https://github.com/jenkinsci/docker/pull/1831](https://github.com/jenkinsci/docker/pull/1831)

**Full Changelog**:
jenkinsci/docker@2.426.3...2.440.1

###
[`v2.426.3`](https://github.com/jenkinsci/docker/releases/tag/2.426.3)

[Compare
Source](https://github.com/jenkinsci/docker/compare/2.426.2...2.426.3)

<!-- Optional: add a release summary here -->

#### 📦 Jenkins Core updates

- Update to Jenkins 2.426.3
([changelog](https://jenkins.io/changelog-stable/#v2.426.3))

#### 📦 Dependency updates

- Bump UBI 9 version to 9.3-1476
([#&#8203;1798](https://github.com/jenkinsci/docker/issues/1798))
[@&#8203;dependabot](https://github.com/dependabot)
- Bump UBI 8 version to 8.9-1107.1705420509
([#&#8203;1807](https://github.com/jenkinsci/docker/issues/1807))
[@&#8203;dependabot](https://github.com/dependabot)
- Bump Debian Bookworm Linux Version to
[`2024011`](https://github.com/jenkinsci/docker/commit/20240110)
([#&#8203;1799](https://github.com/jenkinsci/docker/issues/1799))

#### 🐛 Bug fixes

- Improve logging for common write permission failure
([#&#8203;1801](https://github.com/jenkinsci/docker/issues/1801))
[@&#8203;clintonsteiner](https://github.com/clintonsteiner)

**Full Changelog**:
jenkinsci/docker@2.426.2...2.426.3

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR was generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View the
[repository job
log](https://developer.mend.io/github/PingCAP-QE/ee-ops).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zMTMuMSIsInVwZGF0ZWRJblZlciI6IjM3LjQzOC4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants