paulmataruso/goflow2
1
0
Fork 0
mirror of https://github.com/openobserve/goflow2.git synced 2025-10-25 00:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

docker: fix build and push of manifest (#145)

Browse Source
This commit is contained in:
Louis
2023-03-14 19:42:14 -07:00
committed by GitHub
parent d53e5f9b5a
commit d72f05bb0b
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/docker-release.yml vendored
View File

@@ -36,6 +36,6 @@ jobs:
- name: Build - name: Build
run: | run: |
export VERSION=$(git describe --tags --abbrev=0 HEAD) export VERSION=$(git describe --tags --abbrev=0 HEAD)
DOCKER_SUFFIX=-amd64 make docker push-docker DOCKER_SUFFIX=-amd64 DOCKER_CMD='buildx build --push --platform linux/amd64' make docker
DOCKER_SUFFIX=-arm64 DOCKER_CMD='buildx build --push --platform linux/arm64/v8' make docker DOCKER_SUFFIX=-arm64 DOCKER_CMD='buildx build --push --platform linux/arm64/v8' make docker
make docker-manifest-release make docker-manifest-release-buildx

4
.github/workflows/docker.yml vendored
View File

@@ -34,6 +34,6 @@ jobs:
- name: Build - name: Build
run: | run: |
DOCKER_SUFFIX=-amd64 make docker push-docker DOCKER_SUFFIX=-amd64 DOCKER_CMD='buildx build --push --platform linux/amd64' make docker
DOCKER_SUFFIX=-arm64 DOCKER_CMD='buildx build --push --platform linux/arm64/v8' make docker DOCKER_SUFFIX=-arm64 DOCKER_CMD='buildx build --push --platform linux/arm64/v8' make docker
make docker-manifest make docker-manifest-buildx

14
Makefile
View File

@@ -80,6 +80,13 @@ docker-manifest:
--amend $(DOCKER_REPO)$(NAME):$(ABBREV)-arm64 --amend $(DOCKER_REPO)$(NAME):$(ABBREV)-arm64
$(DOCKER_BIN) manifest push $(DOCKER_REPO)$(NAME):latest $(DOCKER_BIN) manifest push $(DOCKER_REPO)$(NAME):latest
.PHONY: docker-manifest-buildx
docker-manifest-buildx:
$(DOCKER_BIN) buildx imagetools create \
-t $(DOCKER_REPO)$(NAME):$(ABBREV) \
$(DOCKER_REPO)$(NAME):$(ABBREV)-amd64 \
$(DOCKER_REPO)$(NAME):$(ABBREV)-arm64
.PHONY: docker-manifest-release .PHONY: docker-manifest-release
docker-manifest-release: docker-manifest-release:
$(DOCKER_BIN) manifest create $(DOCKER_REPO)$(NAME):$(VERSION) \ $(DOCKER_BIN) manifest create $(DOCKER_REPO)$(NAME):$(VERSION) \
@@ -87,6 +94,13 @@ docker-manifest-release:
--amend $(DOCKER_REPO)$(NAME):$(ABBREV)-arm64 --amend $(DOCKER_REPO)$(NAME):$(ABBREV)-arm64
$(DOCKER_BIN) manifest push $(DOCKER_REPO)$(NAME):$(VERSION) $(DOCKER_BIN) manifest push $(DOCKER_REPO)$(NAME):$(VERSION)
.PHONY: docker-manifest-release-buildx
docker-manifest-buildx:
$(DOCKER_BIN) buildx imagetools create \
-t $(DOCKER_REPO)$(NAME):$(VERSION) \
$(DOCKER_REPO)$(NAME):$(ABBREV)-amd64 \
$(DOCKER_REPO)$(NAME):$(ABBREV)-arm64
.PHONY: package-deb .PHONY: package-deb
package-deb: prepare package-deb: prepare
fpm -s dir -t deb -n $(NAME) -v $(VERSION_PKG) \ fpm -s dir -t deb -n $(NAME) -v $(VERSION_PKG) \