diff --git a/.github/workflows/docker-build-workflow.yaml b/.github/workflows/docker-build-workflow.yaml index f9b9a71..116bc99 100644 --- a/.github/workflows/docker-build-workflow.yaml +++ b/.github/workflows/docker-build-workflow.yaml @@ -52,11 +52,8 @@ jobs: context: . file: ${{ matrix.file }} push: true - # tags: | - # ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.sha }} - # ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ inputs.tag }} tags: | - ghcr.io/denispalnitsky/${{ matrix.image_name }}:${{ github.sha }} - ghcr.io/denispalnitsky/${{ matrix.image_name }}:${{ inputs.tag }} + ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.sha }} + ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ inputs.tag }} platforms: linux/amd64,linux/arm64 target: ${{ matrix.target }} \ No newline at end of file diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml index 9c0d7ba..bfc5743 100644 --- a/.github/workflows/images.yaml +++ b/.github/workflows/images.yaml @@ -7,53 +7,10 @@ on: - 'README.md' branches: - main + jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - strategy: - matrix: - include: - - target: main - file: Dockerfile - image_name: librechat-rag-api-dev - - target: lite - file: Dockerfile.lite - image_name: librechat-rag-api-dev-lite - - steps: - # Check out the repository - - name: Checkout - uses: actions/checkout@v4 - - # Set up QEMU - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - # Set up Docker Buildx - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - # Log in to GitHub Container Registry - - name: Log in to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Build and push Docker images for each target - - name: Build and push Docker images - uses: docker/build-push-action@v5 - with: - context: . - file: ${{ matrix.file }} - push: true - tags: | - ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:${{ github.sha }} - ghcr.io/${{ github.repository_owner }}/${{ matrix.image_name }}:latest - platforms: linux/amd64,linux/arm64 - target: ${{ matrix.target }} + call-docker-build: + uses: ./.github/workflows/docker-build-workflow.yaml + with: + tag: latest \ No newline at end of file