Merge branch 'base-docker-image' into 'master'
Use base docker image with installed dependencies See merge request ros_tracing/ros2_tracing!25
This commit is contained in:
		
						commit
						be117ae072
					
				
					 2 changed files with 14 additions and 4 deletions
				
			
		| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
image: ros:dashing-ros-base-bionic
 | 
					image: registry.gitlab.com/ros_tracing/ros2_tracing/ci-base:latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
variables:
 | 
					variables:
 | 
				
			||||||
  DOCKER_DRIVER: overlay2
 | 
					  DOCKER_DRIVER: overlay2
 | 
				
			||||||
| 
						 | 
					@ -8,10 +8,7 @@ before_script:
 | 
				
			||||||
  - vcs import < instrumentation.repos
 | 
					  - vcs import < instrumentation.repos
 | 
				
			||||||
  - vcs import < ci_source_deps.repos
 | 
					  - vcs import < ci_source_deps.repos
 | 
				
			||||||
  - apt-get update
 | 
					  - apt-get update
 | 
				
			||||||
  - apt-get install --no-install-recommends -y libasio-dev libtinyxml2-dev
 | 
					 | 
				
			||||||
  - apt-get install -y python3-lttng python3-babeltrace
 | 
					 | 
				
			||||||
  - rosdep update
 | 
					  - rosdep update
 | 
				
			||||||
  - export RTI_NC_LICENSE_ACCEPTED=yes
 | 
					 | 
				
			||||||
  - rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
 | 
					  - rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# build:
 | 
					# build:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										13
									
								
								docker-ci-base/Dockerfile
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								docker-ci-base/Dockerfile
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,13 @@
 | 
				
			||||||
 | 
					FROM ros:dashing-ros-base-bionic
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RUN apt-get update
 | 
				
			||||||
 | 
					RUN apt-get install --no-install-recommends -y \
 | 
				
			||||||
 | 
					    libasio-dev \
 | 
				
			||||||
 | 
					    libtinyxml2-dev
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					RUN apt-get install -y \
 | 
				
			||||||
 | 
					    python3-lttng \
 | 
				
			||||||
 | 
					    python3-babeltrace
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					ENV RTI_NC_LICENSE_ACCEPTED=yes
 | 
				
			||||||
 | 
					RUN apt-get install rti-connext-dds-5.3.1
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue