Support different container registries

Dockerfile

@@ -30,10 +30,6 @@ COPY oobabooga/requirements* ./
 RUN source /venv/bin/activate && \
  pip3 install -r requirements.txt && \
  bash -c 'for req in extensions/*/requirements.txt ; do pip3 install -r "$req" ; done' && \
- mkdir -p repositories && \
- cd repositories && \
- git clone https://github.com/turboderp/exllamav2 && \
- pip3 install -r exllamav2/requirements.txt && \
  deactivate
 
 # Fix safetensors module broken by above exllama repository installation

README.md

@@ -43,7 +43,7 @@ to launch it on RunPod.
 ## Building the Docker image
 
 > [!NOTE]
-> You will need to edit the `docker-bake.hcl` file and update `USERNAME`,
+> You will need to edit the `docker-bake.hcl` file and update `REGISTRY_USER`,
 > and `RELEASE`. You can obviously edit the other values too, but these
 > are the most important ones.
 
@@ -57,6 +57,10 @@ docker login
 # Build the image, tag the image, and push the image to Docker Hub
 cd text-generation-docker
 docker buildx bake -f docker-bake.hcl --push
+
+# Same as above but customize registry/user/release:
+REGISTRY=ghcr.io REGISTRY_USER=myuser RELEASE=my-release docker buildx \
+ bake -f docker-bake.hcl --push
 ```
 
 ## Running Locally

docker-bake.hcl

@@ -1,4 +1,8 @@
-variable "USERNAME" {
+variable "REGISTRY" {
+ default = "docker.io"
+}
+
+variable "REGISTRY_USER" {
  default = "ashleykza"
 }
 
@@ -7,21 +11,37 @@ variable "APP" {
 }
 
 variable "RELEASE" {
- default = "1.17.1"
+ default = "1.17.2"
 }
 
 variable "CU_VERSION" {
  default = "121"
 }
 
+variable "BASE_IMAGE_REPOSITORY" {
+ default = "ashleykza/runpod-base"
+}
+
+variable "BASE_IMAGE_VERSION" {
+ default = "1.0.2"
+}
+
+variable "CUDA_VERSION" {
+ default = "12.1.1"
+}
+
+variable "TORCH_VERSION" {
+ default = "2.2.1"
+}
+
 target "default" {
  dockerfile = "Dockerfile"
- tags = ["${USERNAME}/${APP}:${RELEASE}"]
+ tags = ["${REGISTRY}/${REGISTRY_USER}/${APP}:${RELEASE}"]
  args = {
  RELEASE = "${RELEASE}"
- BASE_IMAGE = "ashleykza/runpod-base:1.0.1-cuda12.1.1-torch2.2.1"
+ 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 = "2.2.1+cu${CU_VERSION}"
+ TORCH_VERSION = "${TORCH_VERSION}+cu${CU_VERSION}"
  OOBABOOGA_COMMIT = "26d822f64f2a029306b250b69dc58468662a4fc6"
  VENV_PATH = "/workspace/venvs/text-generation-webui"
  }