From b45efde6f4713f564d1536710ad927fb92e51fde Mon Sep 17 00:00:00 2001
From: Miguel Prada <miguel.prada@tecnalia.com>
Date: Mon, 11 Feb 2019 15:53:34 +0100
Subject: [PATCH] Use fully qualified name to tag image, not just for pushing
---
.gitlab-industrial-ci-kinetic-no-rosinstall.yml | 2 +-
.gitlab-industrial-ci-kinetic-with-rosinstall.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
index 6bd583f..1902841 100644
--- a/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-no-rosinstall.yml
@@ -45,7 +45,7 @@ industrial_ci_kinetic_deploy:
- wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/Dockerfile
- wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/ros_entrypoint.bash
- chmod a+x ros_entrypoint.bash
- - docker build -t ${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
+ - docker build -t ${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
- docker push ${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}
only:
- tags
diff --git a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
index 1ddbde8..faf2fac 100644
--- a/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
+++ b/.gitlab-industrial-ci-kinetic-with-rosinstall.yml
@@ -47,7 +47,7 @@ industrial_ci_kinetic_deploy:
- wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/Dockerfile
- wget https://git.code.tecnalia.com/tecnalia_robotics-public/gitlab_templates/raw/deploy-image-build/deploy/ros_entrypoint.bash
- chmod a+x ros_entrypoint.bash
- - docker build -t ${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
+ - docker build -t ${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME} .
- docker push ${ARTIFACT_DOCKER_URL}/${ARTIFACT_DOCKER_REGISTRY_NAME}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_NAME}
only:
- tags
--
GitLab