Merge branch 'use-custom-docker-image-no-docker-base-image' into 'master'

Use custom docker image no docker base image

See merge request tecnalia_robotics-public/gitlab_templates!11

.gitlab-industrial-ci-kinetic-no-rosinstall.yml

@@ -19,10 +19,12 @@ industrial_ci_kinetic:
   before_script:
     - apk add --update bash coreutils tar
     - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+    - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   script: .ci_config/gitlab.sh
   variables:
     ROS_DISTRO: kinetic
     ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
+    DOCKER_IMAGE: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-base-devel"
   when: always
 
 ##########################################################

.gitlab-industrial-ci-kinetic-with-rosinstall.yml

@@ -19,12 +19,14 @@ industrial_ci_kinetic:
   before_script:
     - apk add --update bash coreutils tar
     - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+    - docker login ${ARTIFACT_DOCKER_URL} -u ${ARTIFACT_CI_USER} -p ${ARTIFACT_CI_TOKEN}
   script: .ci_config/gitlab.sh
   variables:
     ROS_DISTRO: kinetic
     ROS_PARALLEL_JOBS: "-j2" # keep this for now, since there seems to be memory limit issues in the ci VM
     UPSTREAM_WORKSPACE: file
     ROSINSTALL_FILENAME: ".rosinstall"
+    DOCKER_IMAGE: "tecnalia-robotics.artifact.tecnalia.com/test-robotics/flexbotics-base-devel"
   when: always
 
 ##########################################################