Merge pull request #232 from mendix/DES-7610-UpgradeCFBuildpack-v5.0.35

* Update cf-mendix-buildpack to 5.0.35
* Update docker-mendix-pack version to 6.0.7
* Upgrade Java version in Dockerfiles to include java-25-openjdk-headless

Author: zlogic

Dockerfile

@@ -2,7 +2,7 @@
 # Mendix Deployment Archive (aka mda file)
 #
 # Author: Mendix Digital Ecosystems, digitalecosystems@mendix.com
-# Version: v6.0.6
+# Version: v6.0.7
 ARG ROOTFS_IMAGE=mendix-rootfs:app
 ARG BUILDER_ROOTFS_IMAGE=mendix-rootfs:builder
 

README.md

@@ -91,7 +91,7 @@ docker push <app-root-fs-image-tag>
 
 When building the the `rootfs-builder.dockerfile` file, you can provide the following additional arguments:
 
-- **CF_BUILDPACK** is a version of CloudFoundry buildpack. Defaults to `v5.0.34`. For stable pipelines, it's recommended to use a fixed **v5.0.34** version. Other Cloud Foundry buildpacks might not work with this version of Docker Buildpack.
+- **CF_BUILDPACK** is a version of CloudFoundry buildpack. Defaults to `v5.0.35`. For stable pipelines, it's recommended to use a fixed **v5.0.35** version. Other Cloud Foundry buildpacks might not work with this version of Docker Buildpack.
 - **CF_BUILDPACK_URL** specifies the URL where the CF buildpack should be downloaded from (for example, a local mirror). Defaults to `https://github.com/mendix/cf-mendix-buildpack/releases/download/${CF_BUILDPACK}/cf-mendix-buildpack.zip`. Specifying **CF_BUILDPACK_URL** will override the version from **CF_BUILDPACK**.
 - **BUILDPACK_XTRACE** can be used to enable CF Buildpack [debug logging](https://github.com/mendix/cf-mendix-buildpack#logging-and-debugging). Set this variable to `true` to enable debug logging.
 

rootfs-app.dockerfile

@@ -12,7 +12,7 @@ ENV LC_ALL C.UTF-8
 # install dependencies & remove package lists
 RUN microdnf update -y && \
     microdnf module enable nginx:1.26 -y && \
-    microdnf install -y glibc-langpack-en python311 openssl nginx nginx-mod-stream java-11-openjdk-headless java-17-openjdk-headless java-21-openjdk-headless tzdata-java fontconfig binutils && \
+    microdnf install -y glibc-langpack-en python311 openssl nginx nginx-mod-stream java-11-openjdk-headless java-17-openjdk-headless java-21-openjdk-headless java-25-openjdk-headless tzdata-java fontconfig binutils && \
     microdnf clean all && rm -rf /var/cache/yum
 
 # Set the user ID

rootfs-builder.dockerfile

@@ -10,7 +10,7 @@ ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 
 # CF buildpack version
-ARG CF_BUILDPACK=v5.0.34
+ARG CF_BUILDPACK=v5.0.35
 # CF buildpack download URL
 ARG CF_BUILDPACK_URL=https://github.com/mendix/cf-mendix-buildpack/releases/download/${CF_BUILDPACK}/cf-mendix-buildpack.zip
 
@@ -20,7 +20,7 @@ ARG BUILDPACK_XTRACE
 # install dependencies & remove package lists
 RUN microdnf update -y && \
     microdnf module enable nginx:1.26 -y && \
-    microdnf install -y wget glibc-langpack-en python311 openssl tar gzip unzip libpq nginx nginx-mod-stream binutils fontconfig findutils java-11-openjdk-headless java-17-openjdk-headless java-21-openjdk-headless && \
+    microdnf install -y wget glibc-langpack-en python311 openssl tar gzip unzip libpq nginx nginx-mod-stream binutils fontconfig findutils java-11-openjdk-headless java-17-openjdk-headless java-21-openjdk-headless java-25-openjdk-headless && \
     microdnf remove -y /usr/bin/python && \
     microdnf clean all && rm -rf /var/cache/yum
 

upgrading-from-v5.md

@@ -43,7 +43,7 @@ After the update, your pipeline might look like this:
 ```shell
 # Preparation steps
 # Download Docker Buildpack
-DOCKER_BUILDPACK_VERSION=v6.0.6
+DOCKER_BUILDPACK_VERSION=v6.0.7
 curl -LJ -o - https://github.com/mendix/docker-mendix-buildpack/archive/refs/tags/${DOCKER_BUILDPACK_VERSION}.tar.gz | tar --strip-components=1 -xvz
 # Checkout the Mendix app source
 git clone <mendix-app-git> mendix-app-src