Bump to latest oobabooga commit, bump base image to version 1.4.0, im…

…prove syncing
ashleykleynhans · Jun 13, 2024 · 71c7ebb · 71c7ebb
1 parent abae57c
commit 71c7ebb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -97,11 +97,12 @@ You can obviously substitute the image name and tag with your own.
 
 ## Environment Variables
 
-| Variable | Description | Default |
-|----------------------|----------------------------------------------|----------------------------------------|
-| VENV_PATH | Set the path for the Python venv for the app | /workspace/venvs/text-generation-webui |
-| JUPYTER_LAB_PASSWORD | Set a password for Jupyter lab | not set - no password |
-| DISABLE_AUTOLAUNCH | Disable Web UI from launching automatically | (not set) |
+| Variable | Description | Default |
+|----------------------|--------------------------------------------------|----------------------------------------|
+| VENV_PATH | Set the path for the Python venv for the app | /workspace/venvs/text-generation-webui |
+| JUPYTER_LAB_PASSWORD | Set a password for Jupyter lab | not set - no password |
+| DISABLE_AUTOLAUNCH | Disable Web UI from launching automatically | (not set) |
+| DISABLE_SYNC | Disable syncing if using a RunPod network volume | (not set) |
 
 ## Logs
 

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -11,7 +11,7 @@ variable "APP" {
 }
 
 variable "RELEASE" {
- default = "1.20.1"
+ default = "1.21.0"
 }
 
 variable "CU_VERSION" {
@@ -23,7 +23,7 @@ variable "BASE_IMAGE_REPOSITORY" {
 }
 
 variable "BASE_IMAGE_VERSION" {
- default = "1.2.0"
+ default = "1.4.0"
 }
 
 variable "CUDA_VERSION" {
@@ -42,7 +42,7 @@ target "default" {
  BASE_IMAGE = "${BASE_IMAGE_REPOSITORY}:${BASE_IMAGE_VERSION}-cuda${CUDA_VERSION}-torch${TORCH_VERSION}"
  INDEX_URL = "https://download.pytorch.org/whl/cu${CU_VERSION}"
  TORCH_VERSION = "${TORCH_VERSION}+cu${CU_VERSION}"
- OOBABOOGA_COMMIT = "abe5ddc8833206381c43b002e95788d4cca0893a"
+ OOBABOOGA_COMMIT = "4820ae9aef3b7716cb00a6519955db435b6dcb56"
  VENV_PATH = "/workspace/venvs/text-generation-webui"
  }
 }
diff --git a/scripts/pre_start.sh b/scripts/pre_start.sh
@@ -14,17 +14,20 @@ else
 fi
 
 sync_apps() {
- # Sync venv to workspace to support Network volumes
- echo "Syncing venv to workspace, please wait..."
- mkdir -p ${VENV_PATH}
- rsync --remove-source-files -rlptDu /venv/ ${VENV_PATH}/
+ # Only sync if the DISABLE_SYNC environment variable is not set
+ if [ -z "${DISABLE_SYNC}" ]; then
+ # Sync venv to workspace to support Network volumes
+ echo "Syncing venv to workspace, please wait..."
+ mkdir -p ${VENV_PATH}
+ mv /venv/* ${VENV_PATH}/
 
- # Sync application to workspace to support Network volumes
- echo "Syncing ${APP} to workspace, please wait..."
- rsync --remove-source-files -rlptDu /${APP}/ /workspace/${APP}/
+  # Sync application to workspace to support Network volumes
+  echo "Syncing ${APP} to workspace, please wait..."
+  mv /${APP} /workspace/${APP}
 
- echo "${TEMPLATE_VERSION}" > ${DOCKER_IMAGE_VERSION_FILE}
- echo "${VENV_PATH}" > "/workspace/${APP}/venv_path"
+ echo "${TEMPLATE_VERSION}" > ${DOCKER_IMAGE_VERSION_FILE}
+ echo "${VENV_PATH}" > "/workspace/${APP}/venv_path"
+ fi
 }
 
 fix_venvs() {