Merge branch 'fix-triggered-docker-build-tag' into 'master'

Fix setting environment variable in triggered builds

Closes #2564

See merge request !1720

.gitlab-ci.yml

@@ -290,6 +290,12 @@ Trigger:docker:
   services:
   - docker:dind
   script:
+    # While triggering from omnibus repo in .com, we explicitly pass IMAGE_TAG
+    # variable, which will be used to tag the final Docker image.
+    # So, if IMAGE_TAG variable is empty, it means the trigger happened from
+    # either CE or EE repository. In that case, we can use the GITLAB_VERSION
+    # variable as IMAGE_TAG.
+    - if [ -z "${IMAGE_TAG}" ] ; then export IMAGE_TAG=${GITLAB_VERSION} ;  fi
     - make docker_trigger_build_and_push
   only:
     - triggers@gitlab-org/omnibus-gitlab

Makefile

@@ -52,13 +52,7 @@ move_to_platform_dir:
 docker_trigger_build_and_push:
 	bundle exec rake docker:build:image
-	# While triggering from omnibus repo in .com, we explicitly pass IMAGE_TAG
-	# variable, which will be used to tag the final Docker image.
-	# So, if IMAGE_TAG variable is empty, it means the trigger happened from
-	# either CE or EE repository. In that case, we can use the GITLAB_VERSION
-	# variable as IMAGE_TAG.
-	if [ -z "$(IMAGE_TAG)" ] ; then export IMAGE_TAG=$(GITLAB_VERSION) ;  fi
-	DOCKER_TAG=$(IMAGE_TAG) bundle exec rake docker:push:triggered
+	DOCKER_TAG=${IMAGE_TAG} bundle exec rake docker:push:triggered
 sync:
 	aws s3 sync pkg/ s3://${RELEASE_BUCKET} --acl public-read --region ${RELEASE_BUCKET_REGION}