Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct docker platforms and optimize make commands (#2066)

Browse Source 
Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2021-06-11 13:05:08 +05:30
committed by GitHub
parent aa45703a99
commit f5dc6ab994
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+8 -12
View File
@@ -20,6 +20,7 @@ PLATFORMS ?= linux/amd64,linux/arm64,linux/arm/v7
# Repository prefix and tag to push multi-architecture images to. # Repository prefix and tag to push multi-architecture images to.
REPO ?= fission REPO ?= fission
TAG ?= dev TAG ?= dev
DOCKER_FLAGS ?= --push --progress plain
check: test-run build clean check: test-run build clean
@@ -46,7 +47,7 @@ install-cli: build-cli
mv cmd/fission-cli/fission /usr/local/bin mv cmd/fission-cli/fission /usr/local/bin
verify-builder: verify-builder:
@./hack/buildx.sh @./hack/buildx.sh $(PLATFORMS)
# build images (environment images are not included) # build images (environment images are not included)
image: image:
@@ -56,27 +57,22 @@ image:
docker build -t reporter -f cmd/builder/Dockerfile.reporter . docker build -t reporter -f cmd/builder/Dockerfile.reporter .
# build multi-architecture images for release. # build multi-architecture images for release.
image-multiarch: verify-builder image-multiarch: verify-builder multiarch-bundle multiarch-fetcher multiarch-builder multiarch-preupgrade multiarch-reporter
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/fission-bundle:$(TAG) --push -f cmd/fission-bundle/Dockerfile.fission-bundle .
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/fetcher:$(TAG) --push -f cmd/fetcher/Dockerfile.fission-fetcher .
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/builder:$(TAG) --push -f cmd/builder/Dockerfile.fission-builder .
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/preupgradechecks:$(TAG) --push -f cmd/preupgradechecks/Dockerfile.fission-preupgradechecks .
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/reporter:$(TAG) --push -f cmd/reporter/Dockerfile.reporter .
multiarch-bundle: verify-builder multiarch-bundle: verify-builder
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/fission-bundle:$(TAG) --push -f cmd/fission-bundle/Dockerfile.fission-bundle . docker buildx build --platform=$(PLATFORMS) -t $(REPO)/fission-bundle:$(TAG) $(DOCKER_FLAGS) -f cmd/fission-bundle/Dockerfile.fission-bundle .
multiarch-fetcher: verify-builder multiarch-fetcher: verify-builder
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/fetcher:$(TAG) --push -f cmd/fetcher/Dockerfile.fission-fetcher . docker buildx build --platform=$(PLATFORMS) -t $(REPO)/fetcher:$(TAG) $(DOCKER_FLAGS) -f cmd/fetcher/Dockerfile.fission-fetcher .
multiarch-builder: verify-builder multiarch-builder: verify-builder
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/builder:$(TAG) --push -f cmd/builder/Dockerfile.fission-builder . docker buildx build --platform=$(PLATFORMS) -t $(REPO)/builder:$(TAG) $(DOCKER_FLAGS) -f cmd/builder/Dockerfile.fission-builder .
multiarch-preupgrade: verify-builder multiarch-preupgrade: verify-builder
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/pre-upgrade-checks:$(TAG) --push -f cmd/preupgradechecks/Dockerfile.fission-preupgradechecks . docker buildx build --platform=$(PLATFORMS) -t $(REPO)/pre-upgrade-checks:$(TAG) $(DOCKER_FLAGS) -f cmd/preupgradechecks/Dockerfile.fission-preupgradechecks .
multiarch-reporter: verify-builder multiarch-reporter: verify-builder
docker buildx build --platform=$(PLATFORMS) -t $(REPO)/reporter:$(TAG) --push -f cmd/reporter/Dockerfile.reporter . docker buildx build --platform=$(PLATFORMS) -t $(REPO)/reporter:$(TAG) $(DOCKER_FLAGS) -f cmd/reporter/Dockerfile.reporter .
generate-crds: generate-crds:
controller-gen crd:trivialVersions=false,preserveUnknownFields=false paths=./pkg/apis/core/v1 output:crd:artifacts:config=crds/v1 controller-gen crd:trivialVersions=false,preserveUnknownFields=false paths=./pkg/apis/core/v1 output:crd:artifacts:config=crds/v1
hack/buildx.sh
+1 -5
View File
@@ -15,12 +15,8 @@ check_platform() {
fi fi
} }
PLATFORMS=($(echo "$@" | tr ',' '\n'))
create_docker_builder create_docker_builder
PLATFORMS=(
linux/amd64
linux/arm6455
linux/arm/v7
)
for platform in "${PLATFORMS[@]}"; do for platform in "${PLATFORMS[@]}"; do
check_platform $platform check_platform $platform
done done