Merge pull request #149 from mendix/maintenance-update

Bumped CF Buildpack version.

Author: zlogic

Dockerfile

@@ -13,7 +13,7 @@ FROM ${BUILDER_ROOTFS_IMAGE} AS builder
 ARG BUILD_PATH=project
 ARG DD_API_KEY
 # CF buildpack version
-ARG CF_BUILDPACK=v4.28.4
+ARG CF_BUILDPACK=v4.30.2
 # CF buildpack download URL
 ARG CF_BUILDPACK_URL=https://github.com/mendix/cf-mendix-buildpack/releases/download/${CF_BUILDPACK}/cf-mendix-buildpack.zip
 

README.md

@@ -57,7 +57,7 @@ For build you can provide next arguments:
 - **BUILD_PATH** indicates where the application model is located. It is a root directory of an unzipped .MDA or .MPK file. In the latter case, this is the directory where your .MPR file is located. Must be within [build context](https://docs.docker.com/engine/reference/commandline/build/#extended-description). Defaults to `./project`.
 - **ROOTFS_IMAGE** is a type of rootfs image. Defaults to `mendix/rootfs:ubi8` (Red Hat Universal Base Image 8). To use Ubuntu 18.04, change this to `mendix/rootfs:bionic`. It's also possible to use a custom rootfs image as described in [Advanced feature: full-build](#advanced-feature-full-build).
 - **BUILDER_ROOTFS_IMAGE** is a type of rootfs image used for downloading the Mendix app dependencies and compiling the Mendix app from source. Defaults to `mendix/rootfs:bionic`. It's also possible to use a custom rootfs image as described in [Advanced feature: full-build](#advanced-feature-full-build).
-- **CF_BUILDPACK** is a version of CloudFoundry buildpack. Defaults to `v4.28.4`. For stable pipelines, it's recommended to use a fixed version from **v4.28.4** and later. CloudFoundry buildpack versions below **v4.28.4** are not supported.
+- **CF_BUILDPACK** is a version of CloudFoundry buildpack. Defaults to `v4.30.2`. For stable pipelines, it's recommended to use a fixed version from **v4.30.2** and later. CloudFoundry buildpack versions below **v4.30.2** are not supported.
 - **EXCLUDE_LOGFILTER** will exclude the `mendix-logfilter` binary from the resulting Docker image if set to `true`. Defaults to `true`. Excluding `mendix-logfilter` will reduce the image size and remove a component that's not commonly used; the `LOG_RATELIMIT` environment variable option will be disabled.
 - **UNINSTALL_BUILD_DEPENDENCIES** will uninstall packages which are not needed to launch an app, and are only used during the build phase. Defaults to `true`. This option will remove several libraries which are known to have unpatched CVE vulnerabilities.
 - **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**.

cf-buildpack.version

@@ -1 +1 @@
-v4.28.4
+v4.30.2

scripts/compilation

@@ -44,7 +44,6 @@ def fix_logfilter():
     if exclude_logfilter:
         logging.info("Removing mendix-logfilter executable")
         shutil.rmtree("/opt/mendix/build/.local/mendix-logfilter")
-        shutil.rmtree("/opt/mendix/buildpack/vendor/mendix-logfilter")
     else:
         os.chmod("/opt/mendix/build/.local/mendix-logfilter/mendix-logfilter", 0o0755)
 
@@ -53,9 +52,9 @@ def make_dependencies_reusable():
     shutil.move("/opt/mendix/build/runtimes", "/var/mendix/build/")
     shutil.move("/opt/mendix/build/.local/usr", "/var/mendix/build/.local/")
     # separate cacerts from reusable jre components
-    jre = java.determine_jdk(runtime.get_java_version(runtime.get_runtime_version(BUILD_PATH)), 'jre')
-    jvm_location_reusable = os.path.join("/var/mendix/build/.local/", java.compose_jvm_target_dir(jre))
-    jvm_location_customized = os.path.join(DOT_LOCAL_LOCATION, java.compose_jvm_target_dir(jre))
+    jre = java._get_java_dependency(java.get_java_major_version(runtime.get_runtime_version(BUILD_PATH)), 'jre')
+    jvm_location_reusable = os.path.join("/var/mendix/build/.local/", java._compose_jvm_target_dir(jre))
+    jvm_location_customized = os.path.join(DOT_LOCAL_LOCATION, java._compose_jvm_target_dir(jre))
     cacerts_file_source = os.path.join(jvm_location_reusable, "lib", "security", "cacerts")
     cacerts_file_target = os.path.join(jvm_location_customized, "lib", "security", "cacerts")
     util.mkdir_p(os.path.dirname(cacerts_file_target))