Merge pull request 'ci: push images to artifactapi registry instead of gitea' (#2) from benvin/push-artifactapi into main
Reviewed-on: #2
This commit was merged in pull request #2.
This commit is contained in:
@@ -5,5 +5,5 @@ steps:
|
|||||||
- name: docker-build
|
- name: docker-build
|
||||||
image: woodpeckerci/plugin-docker-buildx
|
image: woodpeckerci/plugin-docker-buildx
|
||||||
settings:
|
settings:
|
||||||
repo: git.unkin.net/unkin/agent-base
|
repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/agent-base
|
||||||
dry_run: true
|
dry_run: true
|
||||||
|
|||||||
@@ -6,11 +6,8 @@ steps:
|
|||||||
- name: docker
|
- name: docker
|
||||||
image: woodpeckerci/plugin-docker-buildx
|
image: woodpeckerci/plugin-docker-buildx
|
||||||
settings:
|
settings:
|
||||||
registry: git.unkin.net
|
registry: artifactapi.k8s.syd1.au.unkin.net
|
||||||
repo: git.unkin.net/unkin/agent-base
|
repo: artifactapi.k8s.syd1.au.unkin.net/docker-internal/agent-base
|
||||||
username: droneci
|
|
||||||
password:
|
|
||||||
from_secret: DRONECI_PASSWORD
|
|
||||||
tags:
|
tags:
|
||||||
- ${CI_COMMIT_TAG}
|
- ${CI_COMMIT_TAG}
|
||||||
- latest
|
- latest
|
||||||
|
|||||||
@@ -3,10 +3,10 @@
|
|||||||
VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "0.0.0-dev")
|
VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "0.0.0-dev")
|
||||||
|
|
||||||
build:
|
build:
|
||||||
docker build -t git.unkin.net/unkin/agent-base:$(VERSION) .
|
docker build -t artifactapi.k8s.syd1.au.unkin.net/docker-internal/agent-base:$(VERSION) .
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
docker rmi git.unkin.net/unkin/agent-base:$(VERSION) 2>/dev/null || true
|
docker rmi artifactapi.k8s.syd1.au.unkin.net/docker-internal/agent-base:$(VERSION) 2>/dev/null || true
|
||||||
|
|
||||||
_LATEST := $(shell git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$$' | head -1)
|
_LATEST := $(shell git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$$' | head -1)
|
||||||
_BASE := $(if $(_LATEST),$(_LATEST),v0.0.0)
|
_BASE := $(if $(_LATEST),$(_LATEST),v0.0.0)
|
||||||
|
|||||||
Reference in New Issue
Block a user