ghcr.io support

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     tags:
-      - "*"
+      - "v*"
 
 env:
   GOVERSION: "1.16"
@@ -28,8 +28,14 @@ jobs:
           restore-keys: ${{ runner.os }}-go-
       - uses: docker/login-action@v1
         with:
+          registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - uses: goreleaser/goreleaser-action@v2
         with:
           args: release

.goreleaser.yml

@@ -152,7 +152,24 @@ dockers:
   - ids:
       - docker
     image_templates:
-    - "axiomhq/cli:{{ .Major }}"
-    - "axiomhq/cli:{{ .Major }}.{{ .Minor }}"
-    - "axiomhq/cli:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
-    - "axiomhq/cli:latest"
+      - "docker.io/axiomhq/cli:{{ .Major }}"
+      - "docker.io/axiomhq/cli:{{ .Major }}.{{ .Minor }}"
+      - "docker.io/axiomhq/cli:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
+      - "docker.io/axiomhq/cli:latest"
+      - "ghcr.io/axiomhq/cli:{{ .Major }}"
+      - "ghcr.io/axiomhq/cli:{{ .Major }}.{{ .Minor }}"
+      - "ghcr.io/axiomhq/cli:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
+      - "ghcr.io/axiomhq/cli:latest"
+    build_flag_templates:
+      - --platform=linux/amd64
+      - --label=org.opencontainers.image.title={{ .ProjectName }}
+      - --label=org.opencontainers.image.description={{ .ProjectName }}
+      - --label=org.opencontainers.image.url=https://axiom.co
+      - --label=org.opencontainers.image.source=https://github.com/axiomhq/cli
+      - --label=org.opencontainers.image.documentation=https://docs.axiom.co/reference/CLI
+      - --label=org.opencontainers.image.licenses=MIT
+      - --label=org.opencontainers.image.author=Axiom, Inc. <[email protected]>
+      - --label=org.opencontainers.image.created={{ .Date }}
+      - --label=org.opencontainers.image.revision={{ .FullCommit }}
+      - --label=org.opencontainers.image.version={{ .Version }}
+      - --label=org.opencontainers.image.vendor=Axiom, Inc.

Makefile

@@ -66,7 +66,7 @@ build: $(GORELEASER) dep.stamp $(call go-pkg-sourcefiles, ./...) ## Build the bi
 .PHONY: clean
 clean: ## Remove build and test artifacts
 	@echo ">> cleaning up artifacts"
-	@rm -rf $(DIST_DIR) $(COVERPROFILE)
+	@rm -rf bin $(DIST_DIR) $(MANPAGES_DIR) $(COVERPROFILE)
 
 .PHONY: cover
 cover: $(COVERPROFILE) ## Calculate the code coverage score