diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 705a5478f2ce..5fe86590c07a 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -27,8 +27,10 @@ jobs: platforms: ${{ matrix.platforms }} runs-on: ${{ matrix.runs-on }} secrets: - dockerUsername: ${{ secrets.LOCALAI_REGISTRY_USERNAME }} - dockerPassword: ${{ secrets.LOCALAI_REGISTRY_PASSWORD }} + dockerUsername: ${{ secrets.DOCKERHUB_USERNAME }} + dockerPassword: ${{ secrets.DOCKERHUB_PASSWORD }} + quayUsername: ${{ secrets.LOCALAI_REGISTRY_USERNAME }} + quayPassword: ${{ secrets.LOCALAI_REGISTRY_PASSWORD }} strategy: # Pushing with all jobs in parallel # eats the bandwidth of all the nodes @@ -107,8 +109,10 @@ jobs: platforms: ${{ matrix.platforms }} runs-on: ${{ matrix.runs-on }} secrets: - dockerUsername: ${{ secrets.LOCALAI_REGISTRY_USERNAME }} - dockerPassword: ${{ secrets.LOCALAI_REGISTRY_PASSWORD }} + dockerUsername: ${{ secrets.DOCKERHUB_USERNAME }} + dockerPassword: ${{ secrets.DOCKERHUB_PASSWORD }} + quayUsername: ${{ secrets.LOCALAI_REGISTRY_USERNAME }} + quayPassword: ${{ secrets.LOCALAI_REGISTRY_PASSWORD }} strategy: matrix: include: diff --git a/.github/workflows/image_build.yml b/.github/workflows/image_build.yml index 34cb25a8c607..8358502b954d 100644 --- a/.github/workflows/image_build.yml +++ b/.github/workflows/image_build.yml @@ -46,6 +46,10 @@ on: required: true dockerPassword: required: true + quayUsername: + required: true + quayPassword: + required: true jobs: reusable_image-build: runs-on: ${{ inputs.runs-on }} @@ -100,7 +104,9 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: quay.io/go-skynet/local-ai + images: | + quay.io/go-skynet/local-ai + localai/localai tags: | type=ref,event=branch type=semver,pattern={{raw}} @@ -122,10 +128,17 @@ jobs: if: github.event_name != 'pull_request' uses: docker/login-action@v3 with: - registry: quay.io username: ${{ secrets.dockerUsername }} password: ${{ secrets.dockerPassword }} + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + registry: quay.io + username: ${{ secrets.quayUsername }} + password: ${{ secrets.quayPassword }} + - name: Build and push uses: docker/build-push-action@v5 with: diff --git a/Makefile b/Makefile index fe6a6b1f5ff8..0aa43c57189f 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ GOLLAMA_VERSION?=aeba71ee842819da681ea537e78846dc75949ac0 GOLLAMA_STABLE_VERSION?=50cee7712066d9e38306eccadcfbb44ea87df4b7 -CPPLLAMA_VERSION?=f3f62f0d835d559e80714bbeb05d03125574e3dd +CPPLLAMA_VERSION?=cb1e2818e0e12ec99f7236ec5d4f3ffd8bcc2f4a # gpt4all version GPT4ALL_REPO?=https://github.com/nomic-ai/gpt4all diff --git a/backend/python/diffusers/diffusers.yml b/backend/python/diffusers/diffusers.yml index 0708dbda7f17..a37f41d9c439 100644 --- a/backend/python/diffusers/diffusers.yml +++ b/backend/python/diffusers/diffusers.yml @@ -53,6 +53,7 @@ dependencies: - nvidia-nccl-cu12==2.18.1 - nvidia-nvjitlink-cu12==12.2.140 - nvidia-nvtx-cu12==12.1.105 + - omegaconf - packaging==23.2 - pillow==10.0.1 - protobuf==4.24.4