(clean up) move docker files from root to docker folder (BerriAI#6109)

* fix move docker files to docker folders * move check file length * fix docker hub deploy
netzbegruenung · Oct 8, 2024 · d742e8c · d742e8c
1 parent ef815f3
commit d742e8c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ghcr_deploy.yml b/.github/workflows/ghcr_deploy.yml
@@ -55,6 +55,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          file: ./docker/Dockerfile
           push: true
           tags: litellm/litellm:${{ github.event.inputs.tag || 'latest' }} 
       -
@@ -63,7 +64,7 @@ jobs:
         with:
           context: .
           push: true
-          file: Dockerfile.database
+          file: ./docker/Dockerfile.database
           tags: litellm/litellm-database:${{ github.event.inputs.tag || 'latest' }}
       -
         name: Build and push litellm-spend-logs image
@@ -111,6 +112,7 @@ jobs:
         uses: docker/build-push-action@4976231911ebf5f32aad765192d35f942aa48cb8
         with:
           context: .
+          file: ./docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}-${{ github.event.inputs.tag || 'latest' }}, ${{ steps.meta.outputs.tags }}-${{ github.event.inputs.release_type }} # if a tag is provided, use that, otherwise use the release tag, and if neither is available, use 'latest'
           labels: ${{ steps.meta.outputs.labels }}
@@ -149,7 +151,7 @@ jobs:
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
           context: .
-          file: Dockerfile.database
+          file: ./docker/Dockerfile.database
           push: true
           tags: ${{ steps.meta-database.outputs.tags }}-${{ github.event.inputs.tag || 'latest' }}, ${{ steps.meta-database.outputs.tags }}-${{ github.event.inputs.release_type }} 
           labels: ${{ steps.meta-database.outputs.labels }} 
@@ -188,7 +190,7 @@ jobs:
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
           context: .
-          file: Dockerfile.non_root
+          file: ./docker/Dockerfile.non_root
           push: true
           tags: ${{ steps.meta-non_root.outputs.tags }}-${{ github.event.inputs.tag || 'latest' }}, ${{ steps.meta-non_root.outputs.tags }}-${{ github.event.inputs.release_type }} 
           labels: ${{ steps.meta-non_root.outputs.labels }} 

diff --git a/check_file_length.py → ci_cd/check_file_length.py b/check_file_length.py → ci_cd/check_file_length.py
diff --git a/Dockerfile → docker/Dockerfile b/Dockerfile → docker/Dockerfile
diff --git a/Dockerfile.alpine → docker/Dockerfile.alpine b/Dockerfile.alpine → docker/Dockerfile.alpine
diff --git a/Dockerfile.custom_ui → docker/Dockerfile.custom_ui b/Dockerfile.custom_ui → docker/Dockerfile.custom_ui
diff --git a/Dockerfile.database → docker/Dockerfile.database b/Dockerfile.database → docker/Dockerfile.database
diff --git a/Dockerfile.non_root → docker/Dockerfile.non_root b/Dockerfile.non_root → docker/Dockerfile.non_root