From 9860cde144779a8d00c78940ae5e43e8f7aaa987 Mon Sep 17 00:00:00 2001 From: Rick <1450685+LinuxSuRen@users.noreply.github.com> Date: Wed, 25 Jan 2023 08:26:53 +0800 Subject: [PATCH] feat: support to set an alternative image owner (#164) Co-authored-by: rick --- .github/workflows/main.yml | 3 ++- .goreleaser.yml | 13 +++++++------ Makefile | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0af1c77..6d4a4b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,6 +41,7 @@ jobs: - name: goreleaser run: | echo "${{ github.token }}" | docker login https://ghcr.io -u ${GITHUB_ACTOR} --password-stdin - make release + GITHUB_ACTOR=$(echo ${GITHUB_ACTOR} | tr '[:upper:]' '[:lower:]') + GIT_OWNER=${GITHUB_ACTOR} make release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.goreleaser.yml b/.goreleaser.yml index 00b3f59..820d718 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -5,6 +5,7 @@ builds: - CGO_ENABLED=0 - GOFLAGS = -mod=vendor - GO111MODULE = on + - GIT_OWNER = yannh goos: - windows - linux @@ -31,18 +32,18 @@ archives: dockers: - image_templates: - - 'ghcr.io/yannh/kubeconform:latest' - - 'ghcr.io/yannh/kubeconform:{{ .Tag }}' - - 'ghcr.io/yannh/kubeconform:{{ .Tag }}-amd64' + - 'ghcr.io/{{.Env.GIT_OWNER}}/kubeconform:latest' + - 'ghcr.io/{{.Env.GIT_OWNER}}/kubeconform:{{ .Tag }}' + - 'ghcr.io/{{.Env.GIT_OWNER}}/kubeconform:{{ .Tag }}-amd64' dockerfile: Dockerfile build_flag_templates: - "--platform=linux/amd64" goos: linux goarch: amd64 - image_templates: - - 'ghcr.io/yannh/kubeconform:latest-alpine' - - 'ghcr.io/yannh/kubeconform:{{ .Tag }}-alpine' - - 'ghcr.io/yannh/kubeconform:{{ .Tag }}-amd64-alpine' + - 'ghcr.io/{{.Env.GIT_OWNER}}/kubeconform:latest-alpine' + - 'ghcr.io/{{.Env.GIT_OWNER}}/kubeconform:{{ .Tag }}-alpine' + - 'ghcr.io/{{.Env.GIT_OWNER}}/kubeconform:{{ .Tag }}-amd64-alpine' dockerfile: Dockerfile-alpine build_flag_templates: - "--platform=linux/amd64" diff --git a/Makefile b/Makefile index 43d8907..7e020eb 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ goreleaser-build-static: cp dist/kubeconform_linux_amd64_v1/kubeconform bin/ release: - docker run -e GITHUB_TOKEN -t -v /var/run/docker.sock:/var/run/docker.sock -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform goreleaser/goreleaser:v1.11.5 release --rm-dist + docker run -e GITHUB_TOKEN -e GIT_OWNER -t -v /var/run/docker.sock:/var/run/docker.sock -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform goreleaser/goreleaser:v1.11.5 release --rm-dist update-deps: go get -u ./...