From 5801b3c3a3c80d6dbdf59f6945c2821c19888bf3 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Thu, 27 Jul 2023 22:53:57 +0800 Subject: [PATCH] feat: add images address Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/workflows/docker-buildx.yml | 2 +- .github/workflows/release.yml | 14 ++++ .goreleaser.yaml | 118 ++++++++++++++-------------- 3 files changed, 73 insertions(+), 61 deletions(-) diff --git a/.github/workflows/docker-buildx.yml b/.github/workflows/docker-buildx.yml index aae1c4a16..0b3efc90f 100644 --- a/.github/workflows/docker-buildx.yml +++ b/.github/workflows/docker-buildx.yml @@ -29,7 +29,7 @@ jobs: - name: Build and release Docker images uses: docker/build-push-action@v3 with: - platforms: linux/amd64,linux/arm64/v8 + platforms: linux/386,linux/amd64,linux/arm64/v8 target: ${{ matrix.bin }} tags: ${{ steps.metadata.outputs.tags }} push: true \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 338845a9b..1811df0d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,6 +24,20 @@ jobs: go-version: stable # More assembly might be required: Docker logins, GPG, etc. It all depends # on your needs. + + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Log in to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + - uses: goreleaser/goreleaser-action@v4 with: # either 'goreleaser' (default) or 'goreleaser-pro': diff --git a/.goreleaser.yaml b/.goreleaser.yaml index cf7ddbb1d..075034e53 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -198,66 +198,64 @@ changelog: - title: Other work order: 9999 -# dockers: -# - image_templates: -# - "openimsdk/open-im-server:{{ .Tag }}-amd64" -# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64" -# dockerfile: Dockerfile -# use: buildx -# build_flag_templates: -# - "--pull" -# - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md" -# - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png" -# - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]' -# - "--label=io.artifacthub.package.license=Apace-2.0" -# - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system" -# - "--label=org.opencontainers.image.created={{.Date}}" -# - "--label=org.opencontainers.image.name={{.ProjectName}}" -# - "--label=org.opencontainers.image.revision={{.FullCommit}}" -# - "--label=org.opencontainers.image.version={{.Version}}" -# - "--label=org.opencontainers.image.source={{.GitURL}}" -# - "--platform=linux/amd64" -# extra_files: -# - scripts/entrypoint.sh -# - image_templates: -# - "goreleaser/goreleaser:{{ .Tag }}-arm64" -# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64" -# dockerfile: Dockerfile -# use: buildx -# build_flag_templates: -# - "--pull" -# - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/Open-IM-Server/main/README.md" -# - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/Open-IM-Server/blob/main/assets/logo/openim-logo-green.png" -# - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]' -# - "--label=io.artifacthub.package.license=Apace-2.0" -# - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system" -# - "--label=org.opencontainers.image.created={{.Date}}" -# - "--label=org.opencontainers.image.name={{.ProjectName}}" -# - "--label=org.opencontainers.image.revision={{.FullCommit}}" -# - "--label=org.opencontainers.image.version={{.Version}}" -# - "--label=org.opencontainers.image.source={{.GitURL}}" -# - "--platform=linux/arm64" -# goarch: arm64 -# extra_files: -# - scripts/entrypoint.sh - -# docker_manifests: -# - name_template: "goreleaser/goreleaser:{{ .Tag }}" -# image_templates: -# - "goreleaser/goreleaser:{{ .Tag }}-amd64" -# - "goreleaser/goreleaser:{{ .Tag }}-arm64" -# - name_template: "ghcr.io/goreleaser/goreleaser:{{ .Tag }}" -# image_templates: -# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64" -# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64" -# - name_template: "goreleaser/goreleaser:latest" -# image_templates: -# - "goreleaser/goreleaser:{{ .Tag }}-amd64" -# - "goreleaser/goreleaser:{{ .Tag }}-arm64" -# - name_template: "ghcr.io/goreleaser/goreleaser:latest" -# image_templates: -# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-amd64" -# - "ghcr.io/goreleaser/goreleaser:{{ .Tag }}-arm64" +dockers: + - image_templates: + - "openim/openim-chat:{{ .Tag }}-amd64" + - "ghcr.io/openimsdk/openim-chat:{{ .Tag }}-amd64" + dockerfile: Dockerfile + use: buildx + build_flag_templates: + - "--pull" + - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/chat/main/README.md" + - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/chat/blob/main/assets/logo/openim-logo-green.png" + - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]' + - "--label=io.artifacthub.package.license=Apace-2.0" + - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system" + - "--label=org.opencontainers.image.created={{.Date}}" + - "--label=org.opencontainers.image.name={{.ProjectName}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.version={{.Version}}" + - "--label=org.opencontainers.image.source={{.GitURL}}" + - "--platform=linux/amd64" + + - image_templates: + - "openim/openim-chat:{{ .Tag }}-arm64" + - "ghcr.io/openimsdk/openim-chat:{{ .Tag }}-arm64" + dockerfile: Dockerfile + use: buildx + build_flag_templates: + - "--pull" + - "--label=io.artifacthub.package.readme-url=https://raw.githubusercontent.com/OpenIMSDK/chat/main/README.md" + - "--label=io.artifacthub.package.logo-url=hhttps://github.com/OpenIMSDK/chat/blob/main/assets/logo/openim-logo-green.png" + - '--label=io.artifacthub.package.maintainers=[{"name":"Xinwei Xiong","email":"3293172751nss@gmail.com"}]' + - "--label=io.artifacthub.package.license=Apace-2.0" + - "--label=org.opencontainers.image.description=OpenIM Open source top instant messaging system" + - "--label=org.opencontainers.image.created={{.Date}}" + - "--label=org.opencontainers.image.name={{.ProjectName}}" + - "--label=org.opencontainers.image.revision={{.FullCommit}}" + - "--label=org.opencontainers.image.version={{.Version}}" + - "--label=org.opencontainers.image.source={{.GitURL}}" + - "--platform=linux/arm64" + goarch: arm64 + + +docker_manifests: + - name_template: "openim/openim-chat:{{ .Tag }}" + image_templates: + - "openim/openim-chat:{{ .Tag }}-amd64" + - "openim/openim-chat:{{ .Tag }}-arm64" + - name_template: "ghcr.io/openimsdk/openim-chat:{{ .Tag }}" + image_templates: + - "ghcr.io/openimsdk/openim-chat:{{ .Tag }}-amd64" + - "ghcr.io/openimsdk/openim-chat:{{ .Tag }}-arm64" + - name_template: "openim/openim-chat:latest" + image_templates: + - "openim/openim-chat:{{ .Tag }}-amd64" + - "openim/openim-chat:{{ .Tag }}-arm64" + - name_template: "ghcr.io/openimsdk/openim-chat:latest" + image_templates: + - "ghcr.io/openimsdk/openim-chat:{{ .Tag }}-amd64" + - "ghcr.io/openimsdk/openim-chat:{{ .Tag }}-arm64" nfpms: - id: packages