Browse Source
			
			
			Merge pull request #41 from mprasil/toolchain_build
			
				Use proper toolchain in Dockerfile
			
			
				pull/47/head
			
			
		 
		
			
				
					
						
						Daniel García
					
					8 years ago
					
						
							committed by
							
								
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 1 changed files with 
2 additions and 
1 deletions
			 
			
		 
		
			
				- 
					
					
					 
					Dockerfile
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
					@ -31,7 +31,7 @@ RUN git config --global url."https://github.com/".insteadOf ssh://git@github.com | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					########################## BUILD IMAGE  ########################## | 
					 | 
					 | 
					########################## BUILD IMAGE  ########################## | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					# We need to use the Rust build image, because | 
					 | 
					 | 
					# We need to use the Rust build image, because | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					# we need the Rust compiler and Cargo tooling | 
					 | 
					 | 
					# we need the Rust compiler and Cargo tooling | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					FROM rustlang/rust:nightly as build | 
					 | 
					 | 
					FROM rust as build | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					# Using bundled SQLite, no need to install it | 
					 | 
					 | 
					# Using bundled SQLite, no need to install it | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					# RUN apt-get update && apt-get install -y\ | 
					 | 
					 | 
					# RUN apt-get update && apt-get install -y\ | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -46,6 +46,7 @@ WORKDIR /app | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					# Copies over *only* your manifests and vendored dependencies | 
					 | 
					 | 
					# Copies over *only* your manifests and vendored dependencies | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					COPY ./Cargo.* ./ | 
					 | 
					 | 
					COPY ./Cargo.* ./ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					COPY ./libs ./libs | 
					 | 
					 | 
					COPY ./libs ./libs | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					COPY ./rust-toolchain ./rust-toolchain | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					# Builds your dependencies and removes the | 
					 | 
					 | 
					# Builds your dependencies and removes the | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					# dummy project, except the target folder | 
					 | 
					 | 
					# dummy project, except the target folder | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |