Commit cc76803d authored by Prada Sarasola, Miguel's avatar Prada Sarasola, Miguel

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

Use custom docker image no docker base image

See merge request !11
parents c700ea1a 4abab144
......@@ -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
##########################################################
......
......@@ -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
##########################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment