mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Merge pull request #118073 from jsafrane/support-podman
Support podman for building release images
This commit is contained in:
		@@ -729,7 +729,8 @@ function kube::util::ensure-cfssl {
 | 
				
			|||||||
# Check if we have "docker buildx" commands available
 | 
					# Check if we have "docker buildx" commands available
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
function kube::util::ensure-docker-buildx {
 | 
					function kube::util::ensure-docker-buildx {
 | 
				
			||||||
  if docker buildx >/dev/null 2>&1; then
 | 
					  # podman returns 0 on `docker buildx version`, docker on `docker buildx`. One of them must succeed.
 | 
				
			||||||
 | 
					  if docker buildx version >/dev/null 2>&1 || docker buildx >/dev/null 2>&1; then
 | 
				
			||||||
    return 0
 | 
					    return 0
 | 
				
			||||||
  else
 | 
					  else
 | 
				
			||||||
    echo "ERROR: docker buildx not available. Docker 19.03 or higher is required with experimental features enabled"
 | 
					    echo "ERROR: docker buildx not available. Docker 19.03 or higher is required with experimental features enabled"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user