From a0d1c47e425fa0003f81c09f21a57faef370e182 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Fri, 28 Jul 2023 14:19:21 +0800 Subject: [PATCH] fix: config env command Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/workflows/build-docker-image.yml | 36 ------- .goreleaser.yaml | 121 ++++++++++++----------- Dockerfile | 3 +- 3 files changed, 64 insertions(+), 96 deletions(-) diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index 5607a41ff..3dd64c930 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -98,39 +98,3 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta3.outputs.tags }} labels: ${{ steps.meta3.outputs.labels }} - -# name: OpenIM Build Docker Images -# on: -# push: -# tags: -# - v* -# jobs: -# build: -# runs-on: ubuntu-latest -# strategy: -# matrix: -# bin: -# - openim-server -# steps: -# - name: Checkout -# uses: actions/checkout@v3 -# - name: Setup Docker Buildx -# uses: docker/setup-buildx-action@v2 -# - name: Login to GitHub Container Registry -# uses: docker/login-action@v2 -# with: -# registry: ghcr.io -# username: ${{ github.repository_owner }} -# password: ${{ secrets.GITHUB_TOKEN }} -# - name: Docker metadata -# id: metadata -# uses: docker/metadata-action@v4 -# with: -# images: ghcr.io/${{ github.repository_owner }}/openim-${{ matrix.bin }} -# - name: Build and release Docker images -# uses: docker/build-push-action@v3 -# with: -# 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/.goreleaser.yaml b/.goreleaser.yaml index e9eb44c94..6dfac0f8c 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -335,66 +335,66 @@ 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 +dockers: + - image_templates: + - "openim/openim-server:{{ .Tag }}-amd64" + - "ghcr.io/openimsdk/openim-server:{{ .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" +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" nfpms: - id: packages @@ -480,6 +480,9 @@ checksum: release: footer: | + + ## Welcome to the {{ .Tag }} release of [chat](https://github.com/OpenIMSDK/chat)!🎉🎉! + **Full Changelog**: https://github.com/OpenIMSDK/Open-IM-Server/compare/{{ .PreviousTag }}...{{ .Tag }} ## Helping out diff --git a/Dockerfile b/Dockerfile index 33c4651c9..290aa02c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,8 @@ RUN /bin/sh -c "make build" # Production Stage FROM alpine -RUN apk --no-cache add tzdata +RUN apk --no-cache add tzdata; \ + apt --no-cache add ca-certificates # Set directory to map logs, config files, scripts, and SDK VOLUME ["/Open-IM-Server/logs", "/Open-IM-Server/config", "/Open-IM-Server/scripts", "/Open-IM-Server/db/sdk"]