Merge pull request #128 from mendix/DES-3298_upgrade-to-cf-buildpack-4.20.0

DES-3298 Fixed CF Buildpack v4.20.0 compatibility

Author: zlogic

.integrationtest.sh

@@ -3,6 +3,7 @@ set -eux
 docker version
 docker-compose version
 make get-sample
+make build-base-images
 make build-image
 tests/test-generic.sh tests/docker-compose-postgres.yml
 #tests/test-generic.sh tests/docker-compose-sqlserver.yml

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.17.1
+ARG CF_BUILDPACK=v4.20.0
 # CF buildpack download URL
 ARG CF_BUILDPACK_URL=https://github.com/mendix/cf-mendix-buildpack/releases/download/${CF_BUILDPACK}/cf-mendix-buildpack.zip
 
@@ -35,6 +35,7 @@ ARG USER_UID=1001
 # 5. Update ownership of /opt/mendix so that the app can run as a non-root user
 # 6. Update permissions of /opt/mendix so that the app can run as a non-root user
 RUN mkdir -p /opt/mendix/buildpack /opt/mendix/build &&\
+    ln -s /root /home/vcap &&\
     echo "Downloading CF Buildpack from ${CF_BUILDPACK_URL}" &&\
     curl -fsSL ${CF_BUILDPACK_URL} -o /tmp/cf-mendix-buildpack.zip && \
     python3 -m zipfile -e /tmp/cf-mendix-buildpack.zip /opt/mendix/buildpack/ &&\
@@ -104,9 +105,9 @@ ENV PYTHONPATH "/opt/mendix/buildpack/lib/:/opt/mendix/buildpack/:/opt/mendix/bu
 COPY scripts/startup scripts/vcap_application.json /opt/mendix/build/
 
 # Create vcap home directory for Datadog configuration
-RUN mkdir -p /home/vcap &&\
-    chown -R ${USER_UID}:0 /home/vcap &&\
-    chmod -R g=u /home/vcap
+RUN mkdir -p /home/vcap /opt/datadog-agent/run &&\
+    chown -R ${USER_UID}:0 /home/vcap /opt/datadog-agent/run &&\
+    chmod -R g=u /home/vcap /opt/datadog-agent/run
 
 # Each comment corresponds to the script line:
 # 1. Make the startup script executable

Dockerfile.rootfs.bionic

@@ -8,7 +8,7 @@ LABEL maintainer="[email protected]"
 # When doing a full build: install dependencies & remove package lists
 RUN apt-get -q -y update && \
  DEBIAN_FRONTEND=noninteractive apt-get upgrade -q -y && \
- DEBIAN_FRONTEND=noninteractive apt-get install -q -y wget curl unzip libpq5 locales python3 python3-distutils libssl1.0.0 libgdiplus nginx-light libnginx-mod-stream && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -q -y wget curl unzip libpq5 locales python3 python3-distutils libssl1.0.0 libgdiplus nginx-light libnginx-mod-stream binutils && \
  rm -rf /var/lib/apt/lists/* && \
  apt-get clean
 

Dockerfile.rootfs.ubi8

@@ -13,7 +13,7 @@ ENV LC_ALL C.UTF-8
 # doesn't include libpq5 python3-distutils libgdiplus
 RUN dnf update -y && \
     dnf module enable nginx:1.18 -y && \
-    dnf install -y wget curl glibc-langpack-en python3 openssl tar gzip unzip nginx nginx-mod-stream fontconfig && \
+    dnf install -y wget curl glibc-langpack-en python3 openssl tar gzip unzip nginx nginx-mod-stream binutils fontconfig && \
     dnf clean all && rm -rf /var/cache/yum
 
 # Set nginx permissions

Makefile

@@ -1,6 +1,7 @@
 VERSION=$(shell cat docker-buildpack.version)
 CF_BUILDPACK_VERSION=$(shell cat cf-buildpack.version)
 ROOTFS_VERSION=$(shell cat rootfs.version)
+ROOTFS_IMAGES=$(patsubst Dockerfile.rootfs.%, rootfs.%, $(wildcard Dockerfile.rootfs.*))
 
 get-sample:
 	if [ -d build ]; then rm -rf build; fi
@@ -9,6 +10,12 @@ get-sample:
 	wget https://s3-eu-west-1.amazonaws.com/mx-buildpack-ci/BuildpackTestApp-mx-7-16.mda -O downloads/application.mpk
 	unzip downloads/application.mpk -d build/
 
+rootfs.%: Dockerfile.rootfs.%
+	docker build \
+	-t mendix/rootfs:$* -f Dockerfile.rootfs.$* .
+
+build-base-images: $(ROOTFS_IMAGES)
+
 build-image:
 	docker build \
 	--build-arg BUILD_PATH=build \

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.17.1`. For stable pipelines, it's recommended to use a fixed version from **v4.17.1** and later. CloudFoundry buildpack versions below **v4.17.1** are not supported.
+- **CF_BUILDPACK** is a version of CloudFoundry buildpack. Defaults to `v4.20.0`. For stable pipelines, it's recommended to use a fixed version from **v4.20.0** and later. CloudFoundry buildpack versions below **v4.20.0** 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.17.1
+v4.20.0

docker-buildpack.version

@@ -1 +1 @@
-v3.2.0
+v3.4.0