Skip to content

Commit ce89390

Browse files
authored
DES-6889 Use .NET images for Mendix 9.22+.
This will align Docker Buildpack with the Mx4PC Tekton pipeline. Other changes: * Bumped up CF Buildpack version.
2 parents bec369f + 80797e7 commit ce89390

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Mendix Deployment Archive (aka mda file)
33
#
44
# Author: Mendix Digital Ecosystems, [email protected]
5-
# Version: v6.0.0
5+
# Version: v6.0.1
66
ARG ROOTFS_IMAGE=mendix-rootfs:app
77
ARG BUILDER_ROOTFS_IMAGE=mendix-rootfs:builder
88

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ docker push <app-root-fs-image-tag>
8989

9090
When building the the `rootfs-builder.dockerfile` file, you can provide the following additional arguments:
9191

92-
- **CF_BUILDPACK** is a version of CloudFoundry buildpack. Defaults to `v5.0.23`. For stable pipelines, it's recommended to use a fixed **v5.0.23** version. Other Cloud Foundry buildpacks might not work with this version of Docker Buildpack.
92+
- **CF_BUILDPACK** is a version of CloudFoundry buildpack. Defaults to `v5.0.26`. For stable pipelines, it's recommended to use a fixed **v5.0.26** version. Other Cloud Foundry buildpacks might not work with this version of Docker Buildpack.
9393
- **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**.
9494
- **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.
9595

build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def build_mpr(source_dir, mpr_file, destination, artifacts_repository=None):
167167
mx_version = cursor.fetchone()[0]
168168
mx_version_value = parse_version(mx_version)
169169
logging.debug('Detected Mendix version {}'.format('.'.join(map(str,mx_version_value))))
170-
dotnet = 'dotnet' if mx_version_value >= (10, 0, 0, 0) else 'mono'
170+
dotnet = 'dotnet' if mx_version_value >= (9, 22, 0, 0) else 'mono'
171171
builder_image = build_mpr_builder(mx_version, dotnet, artifacts_repository)
172172
model_version = None
173173
try:

rootfs-builder.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV LANG C.UTF-8
1010
ENV LC_ALL C.UTF-8
1111

1212
# CF buildpack version
13-
ARG CF_BUILDPACK=v5.0.23
13+
ARG CF_BUILDPACK=v5.0.26
1414
# CF buildpack download URL
1515
ARG CF_BUILDPACK_URL=https://github.com/mendix/cf-mendix-buildpack/releases/download/${CF_BUILDPACK}/cf-mendix-buildpack.zip
1616

upgrading-from-v5.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ After the update, your pipeline might look like this:
4343
```shell
4444
# Preparation steps
4545
# Downloag Docker Buildpack
46-
DOCKER_BUILDPACK_VERSION=v6.0.0
46+
DOCKER_BUILDPACK_VERSION=v6.0.1
4747
curl -LJ -o - https://github.com/mendix/docker-mendix-buildpack/archive/refs/tags/${DOCKER_BUILDPACK_VERSION}.tar.gz | tar --strip-components=1 -xvz
4848
# Checkout the Mendix app source
4949
git clone <mendix-app-git> mendix-app-src

0 commit comments

Comments
 (0)