From d742e8cb432f0f1bd613d456e1ee9fbadc2b53f0 Mon Sep 17 00:00:00 2001
From: Ishaan Jaff <ishaanjaffer0324@gmail.com>
Date: Tue, 8 Oct 2024 08:23:52 +0530
Subject: [PATCH] (clean up) move docker files from root to `docker` folder
 (#6109)

* fix move docker files to docker folders

* move check file length

* fix docker hub deploy
---
 .github/workflows/ghcr_deploy.yml                   | 8 +++++---
 check_file_length.py => ci_cd/check_file_length.py  | 0
 Dockerfile => docker/Dockerfile                     | 0
 Dockerfile.alpine => docker/Dockerfile.alpine       | 0
 Dockerfile.custom_ui => docker/Dockerfile.custom_ui | 0
 Dockerfile.database => docker/Dockerfile.database   | 0
 Dockerfile.non_root => docker/Dockerfile.non_root   | 0
 7 files changed, 5 insertions(+), 3 deletions(-)
 rename check_file_length.py => ci_cd/check_file_length.py (100%)
 rename Dockerfile => docker/Dockerfile (100%)
 rename Dockerfile.alpine => docker/Dockerfile.alpine (100%)
 rename Dockerfile.custom_ui => docker/Dockerfile.custom_ui (100%)
 rename Dockerfile.database => docker/Dockerfile.database (100%)
 rename Dockerfile.non_root => docker/Dockerfile.non_root (100%)

diff --git a/.github/workflows/ghcr_deploy.yml b/.github/workflows/ghcr_deploy.yml
index e3b20778e44b..75015f857f61 100644
--- 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 b/ci_cd/check_file_length.py
similarity index 100%
rename from check_file_length.py
rename to ci_cd/check_file_length.py
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile
diff --git a/Dockerfile.alpine b/docker/Dockerfile.alpine
similarity index 100%
rename from Dockerfile.alpine
rename to docker/Dockerfile.alpine
diff --git a/Dockerfile.custom_ui b/docker/Dockerfile.custom_ui
similarity index 100%
rename from Dockerfile.custom_ui
rename to docker/Dockerfile.custom_ui
diff --git a/Dockerfile.database b/docker/Dockerfile.database
similarity index 100%
rename from Dockerfile.database
rename to docker/Dockerfile.database
diff --git a/Dockerfile.non_root b/docker/Dockerfile.non_root
similarity index 100%
rename from Dockerfile.non_root
rename to docker/Dockerfile.non_root