Skip to content

Commit b8be136

Browse files
Fixed the issues with spaces on file name
-Reverted the previous change in build.py - Added the fixed in mxbuild/build
1 parent 96dfcb4 commit b8be136

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def build_mpr(source_dir, mpr_file, destination, artifacts_repository=None):
175175
except Exception as e:
176176
model_version = 'unversioned'
177177
logging.warning('Cannot determine git commit ({}), will set model version to unversioned'.format(e))
178-
container_id = container_call(['container', 'create', builder_image, "/workdir/project/" + os.path.basename(mpr_file), model_version])
178+
container_id = container_call(['container', 'create', builder_image, os.path.basename(mpr_file), model_version])
179179
atexit.register(delete_container, container_id)
180180
container_call(['container', 'cp', os.path.abspath(source_dir)+'/.', f"{container_id}:/workdir/project"])
181181
build_result = container_call(['start', '--attach', '--interactive', container_id])

mxbuild/build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cd /workdir
1818
if [ -f /workdir/project ]; then
1919
JAVA_VERSION=$(cat java-version)
2020
elif [ -f /opt/mendix/modeler/mx ]; then
21-
JAVA_VERSION=$(/opt/mendix/modeler/mx dump-mpr --unit-type 'Settings$ProjectSettings' /workdir/project/${MPR_FILENAME} | \
21+
JAVA_VERSION=$(/opt/mendix/modeler/mx dump-mpr --unit-type 'Settings$ProjectSettings' /workdir/project/"${MPR_FILENAME}" | \
2222
jq -r '.units[] | select(.["$Type"]=="Settings$ProjectSettings") | .["settingsParts"][] | select(.["$Type"]=="Settings$RuntimeSettings").javaVersion | if (. == null or . == "null") then "Java11" else . end')
2323
else
2424
JAVA_VERSION=11
@@ -33,4 +33,4 @@ $MXBUILD_COMMAND \
3333
--target=package \
3434
--java-home=${JDK_HOME} --java-exe-path=${JDK_HOME}/bin/java \
3535
--model-version=${MODEL_VERSION} \
36-
--output="/workdir/output.mda /workdir/project/${MPR_FILENAME}"
36+
--output=/workdir/output.mda /workdir/project/"${MPR_FILENAME}"

0 commit comments

Comments
 (0)