Browse Source
			
			
			Merge pull request #1116 from jjlin/docker
			
				Fix the Alpine build
			
			
				pull/1119/head
			
			
		 
		
			
				
					
						
						Daniel García
					
					5 years ago
					
						
							committed by
							
								
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
1 additions and 
7 deletions
			 
			
		 
		
			
				- 
					
					
					 
					docker/Dockerfile.j2
				
 
			
				- 
					
					
					 
					docker/amd64/Dockerfile.alpine
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -113,7 +113,7 @@ RUN apt-get update \ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					ENV CARGO_HOME "/root/.cargo" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					ENV USER "root" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					{% endif %} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					{% if "amd64" in target_file %} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					{% if "amd64" in target_file and "alpine" not in target_file %} | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					# Install DB packages | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					RUN apt-get update && apt-get install -y \ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    --no-install-recommends \ | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -32,12 +32,6 @@ RUN rustup set profile minimal | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					ENV USER "root" | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					ENV RUSTFLAGS='-C link-arg=-s' | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					# Install DB packages | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					RUN apt-get update && apt-get install -y \ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    --no-install-recommends \ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    libmariadb-dev \ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    libpq-dev \ | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					    && rm -rf /var/lib/apt/lists/* | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					# Creates a dummy project used to grab dependencies | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					RUN USER=root cargo new --bin /app | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |