Add option to skip base image (re)build
This commit is contained in:
		
							parent
							
								
									54877f1db8
								
							
						
					
					
						commit
						dbd238fcde
					
				
					 1 changed files with 6 additions and 4 deletions
				
			
		
							
								
								
									
										10
									
								
								makeimage.sh
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								makeimage.sh
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -5,11 +5,13 @@ source util/vars.sh
 | 
			
		|||
 | 
			
		||||
export DOCKER_BUILDKIT=1
 | 
			
		||||
 | 
			
		||||
if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
 | 
			
		||||
    docker build --tag "$BASE_IMAGE" images/base
 | 
			
		||||
fi
 | 
			
		||||
if [[ -z "$QUICKBUILD" ]]; then
 | 
			
		||||
    if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
 | 
			
		||||
        docker build --tag "$BASE_IMAGE" images/base
 | 
			
		||||
    fi
 | 
			
		||||
 | 
			
		||||
docker build --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
 | 
			
		||||
    docker build --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue