chore(build): build binaries locally and load them into containers

this significantly speeds up build/run time for local e2e

Author: ecordell

Makefile

@@ -44,11 +44,16 @@ build: clean $(CMDS)
 build-coverage: build_cmd=test -c -covermode=count -coverpkg ./pkg/controller/...
 build-coverage: clean $(CMDS)
 
+build-linux: build_cmd=build
+build-linux: arch_flags=GOOS=linux GOARCH=386
+build-linux: clean $(CMDS)
+
 $(CMDS): version_flags=-ldflags "-w -X $(PKG)/pkg/version.GitCommit=`git rev-parse --short HEAD` -X $(PKG)/pkg/version.OLMVersion=`cat OLM_VERSION`"
 $(CMDS):
-	CGO_ENABLED=0 go $(build_cmd) $(MOD_FLAGS) $(version_flags) -o $@ $(PKG)/cmd/$(shell basename $@);
+	CGO_ENABLED=0 $(arch_flags) go $(build_cmd) $(MOD_FLAGS) $(version_flags) -o $@ $(PKG)/cmd/$(shell basename $@);
 
-run-local:
+run-local: build-linux
+	rm -rf build
 	. ./scripts/build_local.sh
 	mkdir -p build/resources
 	. ./scripts/package_release.sh 1.0.0 build/resources Documentation/install/local-values.yaml
@@ -73,7 +78,7 @@ setup-bare: clean e2e.namespace
 e2e:
 	go test -v -failfast -timeout 70m ./test/e2e/... -namespace=openshift-operators -kubeconfig=${KUBECONFIG} -olmNamespace=openshift-operator-lifecycle-manager
 
-e2e-local:
+e2e-local: build-linux
 	. ./scripts/build_local.sh
 	. ./scripts/run_e2e_local.sh $(TEST)
 

local.Dockerfile

@@ -0,0 +1,8 @@
+FROM alpine:latest
+WORKDIR /
+COPY olm /bin/olm
+COPY catalog /bin/catalog
+COPY package-server /bin/package-server
+EXPOSE 8080
+EXPOSE 5443
+CMD ["/bin/olm"]

scripts/build_local.sh

@@ -5,16 +5,15 @@
 
 set -e
 
-if [ -z "$NO_MINIKUBE" ]; then
+if [ -z "$NO_MINIKUBE" ] || [ -x "$(command -v minikube)" ]; then
   ps x | grep -q [m]inikube || minikube start --kubernetes-version="v1.12.0" --extra-config=apiserver.v=4 || { echo 'Cannot start minikube.'; exit 1; }
   eval $(minikube docker-env) || { echo 'Cannot switch to minikube docker'; exit 1; }
   kubectl config use-context minikube
 fi
-docker build -f upstream.Dockerfile .
-docker tag $(docker images --filter 'label=stage=olm' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/operator-framework/olm:local
-docker tag $(docker images --filter 'label=stage=builder' --format '{{.CreatedAt}}\t{{.ID}}' | sort -nr | head -n 1 | cut -f2) quay.io/operator-framework/olm-e2e:local
 
-if [ -x "$(command -v kind)" ]; then
+docker build -f local.Dockerfile -t quay.io/operator-framework/olm:local -t quay.io/operator-framework/olm-e2e:local ./bin
+
+if [ -x "$(command -v kind)" ] && [ "kubectl config current-context" -eq "kind" ]; then
   kind load docker-image quay.io/operator-framework/olm:local
   kind load docker-image quay.io/operator-framework/olm-e2e:local
 fi