From 83aff02a697d3e4fd17c0744fa1e40b9e2de98c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eystein=20M=C3=A5l=C3=B8y=20Stenberg?=
 <eystein.maloy.stenberg@northern.tech>
Date: Wed, 1 May 2019 09:16:12 -0700
Subject: [PATCH] Update mender-artifact to v3 beta. Note that --update (-u)
 option changed to --file (-f) in v3.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changelog: Use mender-artfact v3. Requires rebuild of device-image-shell container.

Signed-off-by: Eystein Måløy Stenberg <eystein.maloy.stenberg@northern.tech>
---
 Dockerfile                              | 2 +-
 device-image-shell/Dockerfile           | 2 +-
 device-image-shell/docker-entrypoint.sh | 2 +-
 mender-convert                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aaa7b9c..eb87e54 100644
--- a/Dockerfile
+++ b/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 \
diff --git a/device-image-shell/Dockerfile b/device-image-shell/Dockerfile
index 5ac2b1d..eaf44b1 100644
--- a/device-image-shell/Dockerfile
+++ b/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 \
diff --git a/device-image-shell/docker-entrypoint.sh b/device-image-shell/docker-entrypoint.sh
index 0ea6094..755829a 100755
--- a/device-image-shell/docker-entrypoint.sh
+++ b/device-image-shell/docker-entrypoint.sh
@@ -34,5 +34,5 @@ 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
+mender-artifact write rootfs-image -t $DEVICE_TYPE -n $ARTIFACT_NAME -f /root_images/$ROOTFS_OUTPUT_FILE_NAME -o /root_images/$ARTIFACT_NAME.mender
 sync
diff --git a/mender-convert b/mender-convert
index d060dde..b01264b 100755
--- a/mender-convert
+++ b/mender-convert
@@ -618,7 +618,7 @@ do_mender_disk_image_to_artifact() {
 
       #Create Mender artifact
       mender-artifact write rootfs-image \
-        --update ${mender_rootfs_image} \
+        --file ${mender_rootfs_image} \
         --output-path ${mender_artifact} \
         --artifact-name ${artifact_name} \
         --device-type ${device_type}