Skip to content

Commit

Permalink
chore: keep only one Dockerfile per Linux image variant (jenkinsci#1857)
Browse files Browse the repository at this point in the history
* create new base images from jdk17 images

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

* remove previous jdk folders

// no jdk17, containing now only empty folders, invisible to git
for jdk in 11 21
do
    git rm -r "${jdk}"
done

* factorize Dockefiles

* shellcheck

* remove JLINK_COMPRESS

* cleaner version

* upstream changes

* more explicit switch

* add the same jdk21 jlink compress arg as Linux for Windows

* use a proper switch like Linux for Windows

* remove suppressed files reintroduced while incorporating upstream changes

* remove unneeded arm/v7 bypass of jlink

Ref:
- https://github.com/jenkinsci/docker/pull/1857/files\#r1584598652

* variable jlink arguments first

* variable jlink arguments first in Windows Dockerfile too

* fixup

* fixup rhel9

* fixup merge

* chore(deps): bump updatecli/updatecli-action from 2.56.0 to 2.57.0 (jenkinsci#1871)

* chore(deps): bump ubi9/ubi in /17/rhel/ubi9/hotspot (jenkinsci#1872)

---------

Co-authored-by: Mark Waite <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed May 6, 2024
1 parent edfeba7 commit e8d146c
Show file tree
Hide file tree
Showing 15 changed files with 90 additions and 1,103 deletions.
143 changes: 0 additions & 143 deletions 11/alpine/hotspot/Dockerfile

This file was deleted.

153 changes: 0 additions & 153 deletions 11/debian/bookworm-slim/hotspot/Dockerfile

This file was deleted.

Loading

0 comments on commit e8d146c

Please sign in to comment.