Merge pull request #169 from 2uasimojo/post-bp-cleanup

Post-boilerplate cleanup

Makefile

@@ -2,49 +2,6 @@ include boilerplate/generated-includes.mk
 
 SHELL := /usr/bin/env bash
 
-# Extend Makefile after here
-CONTAINER_ENGINE?=docker
-
-# Needed for build-catalog-image
-CATALOG_REGISTRY_ORGANIZATION?=app-sre
-
-# TODO: Remove once app-interface config is updated
-.PHONY: build
-build: docker-build
-	@echo "$@ success!"
-
-# TODO: Remove once app-interface and prow config is updated
-.PHONY: gobuild
-gobuild: go-build
-	@echo "$@ success!"
-
-# Build the docker image
-# TODO: Remove below target once prow config is updated
-.PHONY: container-build
-container-build: docker-build
-	@echo "$@ success!"
-
-# Push the docker image
-# TODO: Remove below target once prow config is updated
-.PHONY: container-push
-container-push: docker-push
-	@echo "$@ success!"
-
-# TODO: Remove below target once prow config is updated
-.PHONY: operator-sdk-generate
-operator-sdk-generate: generate
-	@echo "$@ success!"
-
-# TODO: Removed once standardized in boilerplate
-.PHONY: generate-syncset
-generate-syncset:
-	if [ "${IN_CONTAINER}" == "true" ]; then \
-		$(CONTAINER_ENGINE) pull quay.io/app-sre/python:3 && $(CONTAINER_ENGINE) tag quay.io/app-sre/python:3 python:3 || true; \
-		$(CONTAINER_ENGINE) run --rm -v `pwd -P`:`pwd -P` python:3 /bin/sh -c "cd `pwd`; pip install oyaml; `pwd`/${GEN_SYNCSET}"; \
-	else \
-		${GEN_SYNCSET}; \
-	fi
-
 .PHONY: boilerplate-update
 boilerplate-update:
 	@boilerplate/update

build/Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /workdir
 COPY go.mod go.sum ./
 RUN go mod download
 COPY . .
-RUN make gobuild
+RUN make go-build
 
 ####
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest