Merge pull request #497 from tranchitella/men-5943-fix-docker-mender-convert

Men 5943 fix docker mender convert

Dockerfile

@@ -75,8 +75,10 @@ RUN mkdir -p /mender-convert/input
 RUN mkdir -p /mender-convert/deploy
 RUN mkdir -p /mender-convert/logs
 
+VOLUME ["/mender-convert/configs"]
 VOLUME ["/mender-convert/input"]
 VOLUME ["/mender-convert/deploy"]
 VOLUME ["/mender-convert/logs"]
+VOLUME ["/mender-convert/work"]
 
 ENTRYPOINT ["/mender-convert/docker-entrypoint.sh"]

README.md

@@ -165,6 +165,11 @@ MENDER_ARTIFACT_NAME=release-1 ./docker-mender-convert \
    --overlay rootfs_overlay_demo/
 ```
 
+The container will use the `work/` directory as a temporary area to unpack and
+customize the image's content. You can customize the work directory path
+by setting the `WORK_DIRECTORY` env variable. To reduce the time required to
+perform the conversion, you can use tempfs or ramfs mount points.
+
 Conversion will take 10-30 minutes, depending on image size and resources
 available. You can watch `log/convert.log.XXXXX` for progress and diagnostics
 information. The exact log file path is printed before the conversion starts.

docker-mender-convert

@@ -24,9 +24,11 @@ if [ -z "$IMAGE_NAME" -a -z "$GIT_PROVIDED_TAG_NAME" ]; then
 fi
 
 IMAGE_NAME=${IMAGE_NAME:-"mendersoftware/mender-convert${GIT_PROVIDED_TAG_NAME:+:$GIT_PROVIDED_TAG_NAME}"}
+CONFIGS_DIRECTORY=${CONFIGS_DIRECTORY:-"$(pwd)/configs"}
 DEPLOY_DIRECTORY=${DEPLOY_DIRECTORY:-"$(pwd)/deploy"}
 INPUT_DIRECTORY=${INPUT_DIRECTORY:-"$(pwd)/input"}
 LOGS_DIRECTORY=${LOGS_DIRECTORY:-"$(pwd)/logs"}
+WORK_DIRECTORY=${WORK_DIRECTORY:-"$(pwd)/work"}
 
 mkdir -p "$DEPLOY_DIRECTORY"
 mkdir -p "$LOGS_DIRECTORY"
@@ -39,9 +41,11 @@ echo "using log file at: ${LOGS_DIRECTORY}/${LOG_FILE}"
 set +e
 docker run \
   --rm \
+  -v "$CONFIGS_DIRECTORY":/mender-convert/configs \
   -v "$INPUT_DIRECTORY":/mender-convert/input \
   -v "$LOGS_DIRECTORY":/mender-convert/logs \
   -v "$DEPLOY_DIRECTORY":/mender-convert/deploy \
+  -v "$WORK_DIRECTORY":/mender-convert/work \
   --privileged=true \
   --cap-add=SYS_MODULE \
   -v /dev:/dev \

work/.gitignore

@@ -0,0 +1 @@
+*