Merge pull request #1673 from SUSE/openjdk_version

Use full version in version label for openjdk containers
SUSE · Sep 20, 2024 · 07f2087 · 07f2087
2 parents 146630d + 8ef4e5e
commit 07f2087
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/bci_build/package/openjdk-devel/README.md.j2 b/src/bci_build/package/openjdk-devel/README.md.j2
@@ -30,7 +30,7 @@ COPY . ./
 RUN javac Hello.java
 
 # Bundle the application into OpenJDK runtime image
-FROM registry.suse.com/bci/openjdk:{{ image.version }}
+FROM registry.suse.com/bci/openjdk:{{ image.tag_version }}
 
 WORKDIR /app
 

diff --git a/src/bci_build/package/openjdk.py b/src/bci_build/package/openjdk.py
@@ -8,6 +8,7 @@
 from bci_build.package import Arch
 from bci_build.package import DevelopmentContainer
 from bci_build.package import OsVersion
+from bci_build.package import Replacement
 from bci_build.package import SupportLevel
 from bci_build.package import _build_tag_prefix
 from bci_build.package import generate_disk_size_constraints
@@ -34,7 +35,8 @@ def _get_openjdk_kwargs(
         # Hardcoding /usr/lib64 in JAVA_HOME atm
         "exclusive_arch": [Arch.AARCH64, Arch.X86_64, Arch.PPC64LE, Arch.S390X],
         "env": JAVA_ENV,
-        "version": java_version,
+        "tag_version": java_version,
+        "version": "%%java_version%%",
         "os_version": os_version,
         "is_latest": is_latest,
         "package_name": f"openjdk-{java_version}"
@@ -44,6 +46,16 @@ def _get_openjdk_kwargs(
             # prevent ftbfs on workers with a root partition with 4GB
             "_constraints": generate_disk_size_constraints(6)
         },
+        "replacements_via_service": [
+            Replacement(
+                regex_in_build_description="%%java_version%%",
+                package_name=(
+                    f"java-{java_version}-openjdk-devel"
+                    if devel
+                    else f"java-{java_version}-openjdk"
+                ),
+            ),
+        ],
         # smoke test for container environment variables
         "custom_end": f"""{DOCKERFILE_RUN} [ -d $JAVA_HOME ]; [ -d $JAVA_BINDIR ]; [ -f "$JAVA_BINDIR/java" ] && [ -x "$JAVA_BINDIR/java" ]""",
     }

diff --git a/src/bci_build/package/openjdk/README.md.j2 b/src/bci_build/package/openjdk/README.md.j2
@@ -32,7 +32,7 @@ To compile and deploy an application, copy the sources and build the application
 
 ```Dockerfile
 # Build the application using the OpenJDK development image
-FROM registry.suse.com/bci/openjdk-devel:{{ image.version }}  as build
+FROM registry.suse.com/bci/openjdk-devel:{{ image.tag_version }}  as build
 
 WORKDIR /app