Merge pull request #89 from estenberg/update-mender-artifact

Update mender-artifact to v3 and use LZMA

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-ARG MENDER_ARTIFACT_VERSION=2.4.0
+ARG MENDER_ARTIFACT_VERSION=3.0.0b1
 ARG GOLANG_VERSION=1.11.2
 
 RUN apt-get update && apt-get install -y \

device-image-shell/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-ARG MENDER_ARTIFACT_VERSION=2.3.0
+ARG MENDER_ARTIFACT_VERSION=3.0.0b1
 
 RUN apt-get update && apt-get install -y \
     wget \

device-image-shell/docker-entrypoint.sh

@@ -33,6 +33,6 @@ fi
 
 umount /root_system
 
-echo "Creating Mender Artifact. This may take a few minutes..."
-mender-artifact write rootfs-image -t $DEVICE_TYPE -n $ARTIFACT_NAME -u /root_images/$ROOTFS_OUTPUT_FILE_NAME -o /root_images/$ARTIFACT_NAME.mender
+echo "Creating Mender Artifact. This may take 10-20 minutes (using LZMA)..."
+mender-artifact --compression lzma write rootfs-image -t $DEVICE_TYPE -n $ARTIFACT_NAME -f /root_images/$ROOTFS_OUTPUT_FILE_NAME -o /root_images/$ARTIFACT_NAME.mender
 sync

mender-convert

@@ -615,10 +615,13 @@ do_mender_disk_image_to_artifact() {
       rm -rf ${output_dir}/mnt
 
       log "\tWriting Mender artifact to: ${mender_artifact}"
+      log "\tThis may take 10-20 minutes (using LZMA)..."
 
       #Create Mender artifact
-      mender-artifact write rootfs-image \
-        --update ${mender_rootfs_image} \
+      mender-artifact \
+        --compression lzma \
+        write rootfs-image \
+        --file ${mender_rootfs_image} \
         --output-path ${mender_artifact} \
         --artifact-name ${artifact_name} \
         --device-type ${device_type}