From e47e6332ba1298864afb59c57019611e1a469ab3 Mon Sep 17 00:00:00 2001 From: Antoine GIRARD Date: Sun, 13 May 2018 01:38:02 +0200 Subject: [PATCH] Setup linux/amd64 + manifest --- .drone.yml | 23 +++++++++++++++++++++-- docker/Makefile | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8e571640b..6def6503d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -241,7 +241,7 @@ pipeline: pull: true secrets: [ docker_username, docker_password ] repo: gitea/gitea - tags: [ '${DRONE_BRANCH##release/v}' ] + tag: '${DRONE_BRANCH##release/v}-linux-amd64' when: event: [ push ] branch: [ release/* ] @@ -251,7 +251,26 @@ pipeline: secrets: [ docker_username, docker_password ] pull: true repo: gitea/gitea - default_tags: true + tag: latest-linux-amd64 + when: + event: [ push, tag ] + + docker: + image: plugins/manifest + secrets: [ docker_username, docker_password ] + platforms: linux/amd64 + template: 'gitea/gitea:${DRONE_BRANCH##release/v}-ARCH' + target: 'gitea/gitea:${DRONE_BRANCH##release/v}' + when: + event: [ push ] + branch: [ release/* ] + + docker: + image: plugins/manifest + secrets: [ docker_username, docker_password ] + platforms: linux/amd64 + template: gitea/gitea:latest-ARCH + target: gitea/gitea:latest when: event: [ push, tag ] diff --git a/docker/Makefile b/docker/Makefile index 7f5525186..dc32dda51 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -2,8 +2,8 @@ DOCKER_IMAGE ?= gitea/gitea DOCKER_TAG ?= latest -DOCKER_REF := $(DOCKER_IMAGE):$(DOCKER_TAG) - +DOCKER_PLATFORM ?= $(shell docker version -f {{.Server.Os}}-{{.Server.Arch}} 2>/dev/null || echo 'undefined') +DOCKER_REF ?= $(DOCKER_IMAGE):$(DOCKER_TAG)-$(DOCKER_PLATFORM) .PHONY: docker docker: