Skip to content

Commit faf54e3

Browse files
committed
fixes for EE image
1 parent fd3603d commit faf54e3

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

.github/workflows/ghcr_deploy.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ jobs:
121121

122122
build-and-push-image-ee:
123123
runs-on: ubuntu-latest
124-
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
125124
permissions:
126125
contents: read
127126
packages: write
@@ -130,38 +129,37 @@ jobs:
130129
uses: actions/checkout@v4
131130
with:
132131
ref: ${{ github.event.inputs.commit_hash }}
133-
# Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
132+
134133
- name: Log in to the Container registry
135134
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
136135
with:
137136
registry: ${{ env.REGISTRY }}
138137
username: ${{ github.actor }}
139138
password: ${{ secrets.GITHUB_TOKEN }}
140-
# This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
141-
- name: Extract metadata (tags, labels) for Docker
142-
id: meta
139+
140+
- name: Extract metadata (tags, labels) for EE Dockerfile
141+
id: meta-ee
143142
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
144143
with:
145-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
144+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee
146145
# Configure multi platform Docker builds
147146
- name: Set up QEMU
148147
uses: docker/setup-qemu-action@e0e4588fad221d38ee467c0bffd91115366dc0c5
149148
- name: Set up Docker Buildx
150149
uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
151-
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
152-
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
153-
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
154-
- name: Build and push Docker image
155-
uses: docker/build-push-action@4976231911ebf5f32aad765192d35f942aa48cb8
150+
151+
- name: Build and push EE Docker image
152+
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
156153
with:
157154
context: .
155+
file: Dockerfile
158156
push: true
159157
tags: |
160-
${{ steps.meta.outputs.tags }}-${{ github.event.inputs.tag || 'latest' }},
161-
${{ steps.meta.outputs.tags }}-${{ github.event.inputs.release_type }}
158+
${{ steps.meta-ee.outputs.tags }}-${{ github.event.inputs.tag || 'latest' }},
159+
${{ steps.meta-ee.outputs.tags }}-${{ github.event.inputs.release_type }}
162160
${{ github.event.inputs.release_type == 'stable' && format('{0}/berriai/litellm-ee:main-{1}', env.REGISTRY, github.event.inputs.tag) || '' }},
163161
${{ github.event.inputs.release_type == 'stable' && format('{0}/berriai/litellm-ee:main-stable', env.REGISTRY) || '' }}
164-
labels: ${{ steps.meta.outputs.labels }}
162+
labels: ${{ steps.meta-ee.outputs.labels }}
165163
platforms: local,linux/amd64,linux/arm64,linux/arm64/v8
166164

167165
build-and-push-image-database:

0 commit comments

Comments
 (0)