From c6c87952db9bf97f2e9c37e0305b57b4d6ed575c Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Mon, 7 Nov 2022 09:26:28 -0600 Subject: [PATCH] try to get docker publish to work --- .github/workflows/release.yml | 8 +++++ .goreleaser.yaml | 66 ++++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8eca7961..b4daf31a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,8 @@ jobs: runs-on: ubuntu-latest env: DOCKER_CLI_EXPERIMENTAL: "enabled" + DOCKER_REGISTRY: "ghcr.io" + DOCKER_IMAGE_NAME: "unpoller/unpoller" steps: - uses: actions/checkout@v3 with: @@ -23,6 +25,9 @@ jobs: - run: git fetch --force --tags - name: Set up QEMU uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v2 - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: @@ -46,3 +51,6 @@ jobs: # Your GoReleaser Pro key, if you are using the 'goreleaser-pro' # distribution: GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }} + DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }} + DOCKER_IMAGE_NAME: ${{ env.DOCKER_IMAGE_NAME }} + diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 6b5a8440..609b0d94 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -26,9 +26,9 @@ builds: dockers: - # amd64 image_templates: - - "ghcr.io/unpoller/unpoller:latest-amd64" - - "ghcr.io/unpoller/unpoller:{{ .Tag }}-amd64" - - "ghcr.io/unpoller/unpoller:v{{ .Major }}-amd64" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:latest-amd64" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:{{ .Tag }}-amd64" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:v{{ .Major }}-amd64" use: buildx build_flag_templates: - "--pull" @@ -39,17 +39,21 @@ dockers: - "--label=org.opencontainers.image.documentation='https://unpoller.com/docs/install/docker'" - "--label=org.opencontainers.image.description='Telemetry and Observability for your UniFi Network'" - "--label=org.opencontainers.image.url='https://unpoller.com'" - - "--label=org.opencontainers.image.source='https://github.com/unpoller/unpoller'" + - "--label=org.opencontainers.image.source={{ .GitURL }}" - "--label=org.opencontainers.image.vendor=unpoller" - "--label=org.opencontainers.image.licenses=MIT" - "--platform=linux/amd64" push_flags: - --tls-verify=false + extra_files: + - "examples/up.conf.example" + - "examples/up.json.example" + - "examples/up.yaml.example" - # arm64 image_templates: - - "ghcr.io/unpoller/unpoller:latest-arm64v8" - - "ghcr.io/unpoller/unpoller:{{ .Tag }}-arm64v8" - - "ghcr.io/unpoller/unpoller:v{{ .Major }}-arm64v8" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:latest-arm64v8" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:{{ .Tag }}-arm64v8" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:v{{ .Major }}-arm64v8" use: buildx build_flag_templates: - "--pull" @@ -60,17 +64,21 @@ dockers: - "--label=org.opencontainers.image.documentation='https://unpoller.com/docs/install/docker'" - "--label=org.opencontainers.image.description='Telemetry and Observability for your UniFi Network'" - "--label=org.opencontainers.image.url='https://unpoller.com'" - - "--label=org.opencontainers.image.source='https://github.com/unpoller/unpoller'" + - "--label=org.opencontainers.image.source={{ .GitURL }}" - "--label=org.opencontainers.image.vendor=unpoller" - "--label=org.opencontainers.image.licenses=MIT" - "--platform=linux/arm64" push_flags: - --tls-verify=false + extra_files: + - "examples/up.conf.example" + - "examples/up.json.example" + - "examples/up.yaml.example" - # armv7 image_templates: - - "ghcr.io/unpoller/unpoller:latest-armv7" - - "ghcr.io/unpoller/unpoller:{{ .Tag }}-armv7" - - "ghcr.io/unpoller/unpoller:v{{ .Major }}-armv7" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:latest-armv7" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:{{ .Tag }}-armv7" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:v{{ .Major }}-armv7" use: buildx build_flag_templates: - "--pull" @@ -81,18 +89,44 @@ dockers: - "--label=org.opencontainers.image.documentation='https://unpoller.com/docs/install/docker'" - "--label=org.opencontainers.image.description='Telemetry and Observability for your UniFi Network'" - "--label=org.opencontainers.image.url='https://unpoller.com'" - - "--label=org.opencontainers.image.source='https://github.com/unpoller/unpoller'" + - "--label=org.opencontainers.image.source={{ .GitURL }}" - "--label=org.opencontainers.image.vendor=unpoller" - "--label=org.opencontainers.image.licenses=MIT" - "--platform=linux/arm/v7" push_flags: - --tls-verify=false + extra_files: + - "examples/up.conf.example" + - "examples/up.json.example" + - "examples/up.yaml.example" docker_manifests: - - name_template: ghcr.io/unpoller/unpoller:{{ .Version }} + - name_template: '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:latest' + create_flags: + - --insecure + push_flags: + - --insecure image_templates: - - ghcr.io/unpoller/unpoller:{{ .Version }}-amd64 - - ghcr.io/unpoller/unpoller:{{ .Version }}-arm64v8 - - ghcr.io/unpoller/unpoller:{{ .Version }}-armv7 + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:latest-amd64" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:latest-arm64v8" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:latest-armv7" + - name_template: '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:{{ .Tag }}' + create_flags: + - --insecure + push_flags: + - --insecure + image_templates: + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:{{ .Tag }}-amd64" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:{{ .Tag }}-arm64v8" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:{{ .Tag }}-armv7" + - name_template: '{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:v{{ .Major }}' + create_flags: + - --insecure + push_flags: + - --insecure + image_templates: + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:v{{ .Major }}-amd64" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:v{{ .Major }}-arm64v8" + - "{{ .Env.DOCKER_REGISTRY }}/{{ .Env.DOCKER_IMAGE_NAME }}:v{{ .Major }}-armv7" nfpms: -