reworked the multiplatform Makefile

This commit is contained in:
Jean-Marc ANDRE 2023-04-14 20:54:26 +02:00
parent 1de6a31e25
commit 1f2baef062
2 changed files with 15 additions and 5 deletions

View File

@ -1,6 +1,6 @@
# Build a small image # Build a small image
FROM --platform=linux/arm64 alpine:3 FROM --platform=linux/arm64 alpine:3
RUN apk add --no-cache su-exec restic postgresql-client RUN apk add --no-cache su-exec restic
COPY ./bin/formolcli /usr/local/bin COPY ./bin/formolcli /usr/local/bin
# Command to run # Command to run

View File

@ -1,12 +1,18 @@
GOARCH ?= amd64 GOARCH ?= amd64
GOOS ?= linux GOOS ?= linux
IMG ?= docker.io/desmo999r/formolcli:latest VERSION ?= latest
IMG ?= docker.io/desmo999r/formolcli:$(VERSION)
MANIFEST = formol-multiarch
BINDIR = ./bin BINDIR = ./bin
.PHONY: formolcli .PHONY: formolcli
formolcli: fmt vet formolcli: fmt vet
GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(BINDIR)/formolcli main.go GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(BINDIR)/formolcli main.go
#.PHONY: formolcli-arm64
#formolcli-arm64: GOARCH = arm64
#formolcli-arm64: formolcli
.PHONY: fmt .PHONY: fmt
fmt: fmt:
go fmt ./... go fmt ./...
@ -17,11 +23,15 @@ vet:
.PHONY: docker-build .PHONY: docker-build
docker-build: formolcli docker-build: formolcli
buildah bud --tag $(IMG) Dockerfile.$(GOARCH) buildah bud --tag $(IMG) --manifest $(MANIFEST) --arch $(GOARCH) Dockerfile.$(GOARCH)
.PHONY: docker-build-arm64
docker-build-arm64: GOARCH = arm64
docker-build-arm64: docker-build
.PHONY: docker-push .PHONY: docker-push
docker-push: docker-build docker-push:
buildah push $(IMG) buildah manifest push --all --rm $(MANIFEST) "docker://$(IMG)"
.PHONY: all .PHONY: all
all: formolcli docker-build all: formolcli docker-build