From 4147cf53b745cf299900d51729ac3184ee861743 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Fri, 4 Aug 2023 15:40:42 +0800 Subject: [PATCH] fix: add scripts path set Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- .github/workflows/image.yml | 95 ------------------------------------- docker-compose.yaml | 8 ++-- 2 files changed, 4 insertions(+), 99 deletions(-) delete mode 100644 .github/workflows/image.yml diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml deleted file mode 100644 index 74972c264..000000000 --- a/.github/workflows/image.yml +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright © 2023 OpenIM open source community. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: Build Image - -on: - push: - branches: - - release-v* - paths: - - "**.go" - - "!**_test.go" - - "build/**" - tags: - - v* - -jobs: - release: - strategy: - matrix: - components: [core, swagger] - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 20 - - uses: dorny/paths-filter@v2 - if: ${{ !startsWith(github.ref_name, 'v') }} - id: changes - with: - filters: | - go: - - '**.go' - - 'build/core/Dockerfile' - api: - - 'openapi/**' - - 'build/swagger/build.sh' - - 'build/swagger/Dockerfile' - - name: Docker meta - id: meta - uses: docker/metadata-action@v4 - with: - flavor: | - latest=false - images: | - ${{ secrets.DOCKERHUB_USERNAME }}/openimsdk-${{ matrix.components }} - registry.cn-hangzhou.aliyuncs.com/${{ secrets.ALIREGISTRY_NAMESPACE }}/openimsdk-${{ matrix.components }} - tags: | - type=ref,event=branch - type=sha,prefix={{branch}}-,enable=${{ github.ref_type == 'branch' }} - type=ref,event=tag - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to Ali Container Registry - uses: docker/login-action@v2 - with: - registry: registry.cn-hangzhou.aliyuncs.com - username: ${{ secrets.ALIREGISTRY_USERNAME }} - password: ${{ secrets.ALIREGISTRY_TOKEN }} - - - name: Condition - id: condition - run: | - echo "run=${{ startsWith(github.ref_name, 'v') || ((steps.changes.outputs.go == 'true' && (matrix.components == 'core' || matrix.components == 'job')) || (steps.changes.outputs.api == 'true' && matrix.components == 'swagger')) }}" >> $GITHUB_OUTPUT - - - name: Set up QEMU - if: ${{ steps.condition.outputs.run == 'true' }} - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - if: ${{ steps.condition.outputs.run == 'true' }} - uses: docker/setup-buildx-action@v2 - - name: Build and push - if: ${{ steps.condition.outputs.run == 'true' }} - uses: docker/build-push-action@v3 - with: - context: . - file: ./build/${{ matrix.components }}/Dockerfile - platforms: linux/amd64 - push: true - tags: ${{ steps.meta.outputs.tags }} diff --git a/docker-compose.yaml b/docker-compose.yaml index dc9a4378b..0531fbda8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -124,10 +124,10 @@ services: openim_chat: image: ghcr.io/openim-sigs/openim-chat:v1.0.0-debug.0 #ghcr.io/openimsdk/openim-chat:latels container_name: openim_chat - # volumes: - # - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs - # - ./_output/openim/openim-chat/config:/openim/openim-chat/config - # - ./_output/openim/openim-chat/scripts:/openim/openim-chat/scripts + volumes: + - ./_output/openim/openim-chat/logs:/openim/openim-chat/logs + - ./_output/openim/openim-chat/config:/openim/openim-chat/config + - ./_output/openim/openim-chat/scripts:/openim/openim-chat/scripts restart: always depends_on: - mysql