Merge branch '1.2.x'

.travis.yml

@@ -9,6 +9,16 @@ dist: trusty
 before_script:
     - git clone git://github.com/mendersoftware/mendertesting
 
+    # Rename the branch we're on, so that it's not in the way for the
+    # subsequent fetch. It's ok if this fails, it just means we're not on any
+    # branch.
+    - git branch -m temp-branch || true
+    # Git trick: Fetch directly into our local branches instead of remote
+    # branches.
+    - git fetch origin 'refs/heads/*:refs/heads/*'
+    # Get last remaining tags, if any.
+    - git fetch --tags origin
+
 script:
     # Check commit compliance.
     - mendertesting/check_commits.sh

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:18.04
 
-ARG MENDER_ARTIFACT_VERSION=3.0.1
+ARG MENDER_ARTIFACT_VERSION=3.2.0
 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=3.0.1
+ARG MENDER_ARTIFACT_VERSION=3.2.0
 
 RUN apt-get update && apt-get install -y \
     wget \

docker-build

@@ -6,7 +6,7 @@ if [ -z "$IMAGE_NAME" ]; then
     IMAGE_NAME=mender-convert
 fi
 
-MENDER_CLIENT_VERSION="2.0.1"
+MENDER_CLIENT_VERSION="2.1.1"
 
 DOCKER_ARGS="--build-arg mender_client_version=${MENDER_CLIENT_VERSION}"