OCPBUGS-17374: Fast specific dockerignore

Improves container runtime detection and applies a runtime specific dockerignore for the fast Dockerfile. The rename from Dockerfile.fast to fast.Dockerfile is due to the conventions in the new Docker build backend. Signed-off-by: Antoni Segura Puimedon <antoni@redhat.com>
openshift · Aug 4, 2023 · 4baeb8d · 4baeb8d
1 parent 2aa885e
commit 4baeb8d
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@ tools/bin
 /kubeconfig
 vendor/**/.dockerignore
 .docker
+/fast.Dockerfile.dockerignore
 
 # ignore util binaries
 /contrib/cleanzones/cleanzones

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ IMG ?= hypershift:latest
 CRD_OPTIONS ?= "crd"
 
 # Runtime CLI to use for building and pushing images
-RUNTIME ?= docker
+RUNTIME ?= $(shell sh hack/utils.sh get_container_engine)
 
 TOOLS_DIR=./hack/tools
 BIN_DIR=bin
@@ -211,10 +211,18 @@ staticcheck: $(STATICCHECK)
 docker-build:
 	${RUNTIME} build . -t ${IMG}
 
+.PHONY: fast.Dockerfile.dockerignore
+fast.Dockerfile.dockerignore:
+	sed -e '/^bin\//d' .dockerignore > fast.Dockerfile.dockerignore
+
 # Build the docker image copying binaries from workspace
 .PHONY: docker-build-fast
-docker-build-fast: build
-	${RUNTIME} build . -t ${IMG} -f Dockerfile.fast
+docker-build-fast: build fast.Dockerfile.dockerignore
+ifeq ($(RUNTIME),podman)
+		${RUNTIME} build . -t ${IMG} -f fast.Dockerfile --ignorefile fast.Dockerfile.dockerignore
+else
+		DOCKER_BUILDKIT=1 ${RUNTIME} build . -t ${IMG} -f fast.Dockerfile
+endif
 
 # Push the docker image
 .PHONY: docker-push

diff --git a/Dockerfile.fast → fast.Dockerfile b/Dockerfile.fast → fast.Dockerfile
diff --git a/hack/container-run.sh b/hack/container-run.sh
@@ -9,19 +9,15 @@
 
 set -ex
 
-if command -v podman > /dev/null 2>&1
-then
-    ENGINE=podman
-elif command -v docker > /dev/null 2>&1
-then
-    ENGINE=docker
-else
-    echo "No container runtime found"
-    exit 1
-fi
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+readonly SCRIPT_DIR
+
+source "${SCRIPT_DIR}/utils.sh"
 
 IMAGE=docker.io/openshift/origin-release:golang-1.16
 
+ENGINE=$(get_container_engine)
+
 ENGINE_CMD="${ENGINE} run --rm -v $(pwd):/go/src/github.com/openshift/hypershift:Z  -w /go/src/github.com/openshift/hypershift $IMAGE"
 
 ${ENGINE_CMD} $*
diff --git a/hack/utils.sh b/hack/utils.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+get_container_engine() {
+	if command -v podman >/dev/null 2>&1; then
+		echo podman
+		retval=0
+	elif command -v docker >/dev/null 2>&1; then
+		echo docker
+		retval=0
+	else
+		echo >&2 "No container runtime found"
+		retval=1
+	fi
+	return $retval
+}
+
+"$@"