diff --git a/.drone/drone.yml b/.drone/drone.yml index e05d819..93197ca 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -19,6 +19,11 @@ steps: from_secret: docker_username DOCKER_PASSWORD: from_secret: docker_password + when: + event: + - push + - tag + - pull_request - name: publish image: docker.io/drycc/go-dev @@ -57,6 +62,11 @@ steps: environment: DEV_REGISTRY: from_secret: dev_registry + when: + event: + - push + - tag + - pull_request - name: publish image: docker.io/drycc/go-dev @@ -90,6 +100,10 @@ steps: environment: DRYCC_REGISTRY: from_secret: drycc_registry + when: + event: + - push + - tag - name: publish image: plugins/manifest @@ -102,7 +116,6 @@ steps: environment: DEV_REGISTRY: from_secret: dev_registry - when: event: - push @@ -111,4 +124,3 @@ steps: depends_on: - linux-amd64 - linux-arm64 - diff --git a/.drone/manifest.tmpl b/.drone/manifest.tmpl index b8a1051..745d56f 100644 --- a/.drone/manifest.tmpl +++ b/.drone/manifest.tmpl @@ -1,4 +1,4 @@ -image: docker.io/drycc/go-dev:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: docker.io/jianxiaoguo/go-dev:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -7,12 +7,12 @@ tags: {{/if}} manifests: - - image: docker.io/drycc/go-dev:{{#if build.tag}}{{build.tag}}{{else}}latest-{{/if}}linux-amd64 + image: docker.io/jianxiaoguo/go-dev:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - image: docker.io/drycc/go-dev:{{#if build.tag}}{{build.tag}}{{else}}latest-{{/if}}linux-arm64 + image: docker.io/jianxiaoguo/go-dev:{{#if build.tag}}{{build.tag}}-{{else}}latest-{{/if}}linux-arm64 platform: architecture: arm64 os: linux diff --git a/Makefile b/Makefile index f87db3f..6610ccf 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION ?= $(shell git describe --tags --exact-match 2>/dev/null || echo latest) DEV_REGISTRY ?= docker.io -IMAGE_PREFIX ?= drycc +IMAGE_PREFIX ?= jianxiaoguo IMAGE := ${DEV_REGISTRY}/${IMAGE_PREFIX}/go-dev:${VERSION} PLATFORM ?= linux/amd64,linux/arm64