Fix GitLab Docker build using default docker-build script

So there are other arguments that need to be passed to docker build,
namely toolchain related, therefore it is better to use the default
script and just override the image name.

Also, removing the Mender version from the GitLab pipeline (and hence
using the one defined in build-docker) removes one point of
inconsistency.

Changelog: None

Signed-off-by: Lluis Campos <lluis.campos@northern.tech>

.gitlab-ci.yml

@@ -2,7 +2,6 @@ image: docker:git
 
 variables:
   DOCKER_REPOSITORY: mendersoftware/mender-convert
-  MENDER_CLIENT_VERSION: '2.0.0'
 
 stages:
   - test
@@ -33,7 +32,7 @@ build:
   services:
     - docker:dind
   script:
-    - docker build -t $DOCKER_REPOSITORY:pr --build-arg mender_client_version=${MENDER_CLIENT_VERSION} .
+    - IMAGE_NAME=$DOCKER_REPOSITORY:pr ./docker-build
     - docker save $DOCKER_REPOSITORY:pr > image.tar
   artifacts:
     expire_in: 2w

docker-build

@@ -2,7 +2,9 @@
 
 set -e
 
-IMAGE_NAME=mender-convert
+if [ -z "$IMAGE_NAME" ]; then
+    IMAGE_NAME=mender-convert
+fi
 
 MENDER_CLIENT_VERSION="2.0.1"