From c4dfc3a1e7822bdca1859f95986b1fc7a54ba993 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sun, 6 Sep 2020 10:16:53 -0300 Subject: [PATCH] feat: support ghcr.io (#1784) Signed-off-by: Carlos Alexandro Becker --- .github/workflows/build.yml | 2 ++ .goreleaser.yml | 6 ++++++ scripts/entrypoint.sh | 12 +++++++----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e77810ff2..37ddee2cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,8 +58,10 @@ jobs: env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + GITHUB_TOKEN: ${{ secrets.GH_PAT }} run: | echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin + echo "${GITHUB_TOKEN}" | docker login ghcr.io --username $GITHUB_ACTOR --password-stdin - name: Snapcraft Login if: success() && startsWith(github.ref, 'refs/tags/v') diff --git a/.goreleaser.yml b/.goreleaser.yml index d34b870a2..e87dfbf7b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -35,8 +35,11 @@ changelog: dockers: - image_templates: - 'goreleaser/goreleaser:{{ .Tag }}-cgo' + - 'ghcr.io/goreleaser/goreleaser:{{ .Tag }}-cgo' - 'goreleaser/goreleaser:v{{ .Major }}.{{ .Minor }}-cgo' + - 'ghcr.io/goreleaser/goreleaser:v{{ .Major }}.{{ .Minor }}-cgo' - 'goreleaser/goreleaser:latest-cgo' + - 'ghcr.io/goreleaser/goreleaser:latest-cgo' dockerfile: Dockerfile.cgo binaries: - goreleaser @@ -50,8 +53,11 @@ dockers: - scripts/entrypoint.sh - image_templates: - 'goreleaser/goreleaser:{{ .Tag }}' + - 'ghcr.io/goreleaser/goreleaser:{{ .Tag }}' - 'goreleaser/goreleaser:v{{ .Major }}.{{ .Minor }}' + - 'ghcr.io/goreleaser/goreleaser:v{{ .Major }}.{{ .Minor }}' - 'goreleaser/goreleaser:latest' + - 'ghcr.io/goreleaser/goreleaser:latest' dockerfile: Dockerfile binaries: - goreleaser diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index dbcda5360..d684b5336 100644 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash if [ -n "$DOCKER_USERNAME" ] && [ -n "$DOCKER_PASSWORD" ]; then - echo "Login to the docker..." - echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin $DOCKER_REGISTRY + echo "Login to the docker..." + echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin "$DOCKER_REGISTRY" fi # Workaround for github actions when access to different repositories is needed. @@ -11,12 +11,14 @@ fi # Access to different repositories is needed by brew for example. if [ -n "$GORELEASER_GITHUB_TOKEN" ] ; then - export GITHUB_TOKEN=$GORELEASER_GITHUB_TOKEN + export GITHUB_TOKEN=$GORELEASER_GITHUB_TOKEN fi if [ -n "$GITHUB_TOKEN" ]; then - # Log into GitHub package registry - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u docker --password-stdin + # Log into GitHub package registry + echo "$GITHUB_TOKEN" | docker login docker.pkg.github.com -u docker --password-stdin + echo "$GITHUB_TOKEN" | docker login ghcr.io -u docker --password-stdin fi +# shellcheck disable=SC2068 goreleaser $@