From 103222e013eb840702fb42a66f24aab84e7604e3 Mon Sep 17 00:00:00 2001 From: Erik Godding Boye Date: Tue, 17 Jan 2023 17:57:18 +0100 Subject: [PATCH] Own review --- Dockerfile | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index da8f358d6..fc5e84404 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ COPY go.sum go.sum RUN go mod download # Copy the go source -COPY cmd/ cmd/ COPY api/ api/ +COPY cmd/ cmd/ COPY internal/ internal/ COPY pkg/ pkg/ diff --git a/Makefile b/Makefile index 8c46830a4..27b8822b3 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ generate-all: manifests generate fmt fmt-imports go-mod-tidy ## Ensure all gener ##@ Build .PHONY: build -build: manifests generate fmt vet ## Build manager binary. +build: generate fmt vet ## Build manager binary. go build -o bin/manager cmd/main.go .PHONY: run @@ -112,7 +112,7 @@ docker-push: ## Push docker image with the manager. # To properly provided solutions that supports more than one platform you should use this option. PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le .PHONY: docker-buildx -docker-buildx: test ## Build and push docker image for the manager for cross-platform support +docker-buildx: ## Build and push docker image for the manager for cross-platform support # copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - docker buildx create --name project-v3-builder