From 0bfbf5a257b019fb8ddb4f1e2ea47678221bf491 Mon Sep 17 00:00:00 2001
From: bkellam <bshizzle1234@gmail.com>
Date: Sat, 31 Aug 2024 19:30:28 -0700
Subject: [PATCH] small renames in docker files

---
 Dockerfile.zoekt-indexserver    |  4 ++--
 Dockerfile.zoekt-webserver      |  4 ++--
 configs/config.json             |  3 +++
 docker-compose.yml              | 10 +++++-----
 entrypoint.zoekt-indexserver.sh |  2 +-
 entrypoint.zoekt-webserver.sh   |  2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.zoekt-indexserver b/Dockerfile.zoekt-indexserver
index f920f1d8..31807c6f 100644
--- a/Dockerfile.zoekt-indexserver
+++ b/Dockerfile.zoekt-indexserver
@@ -19,8 +19,8 @@ RUN apk add --no-cache git ca-certificates bind-tools tini jansson wget
 COPY vendor/zoekt/install-ctags-alpine.sh .
 RUN ./install-ctags-alpine.sh && rm install-ctags-alpine.sh
 
-ENV DATA_DIR /zoekt-data/
-RUN mkdir -p ${DATA_DIR}
+ENV ZOEKT_DATA_CACHE_DIR /zoekt-data/
+RUN mkdir -p ${ZOEKT_DATA_CACHE_DIR}
 
 ENV CONFIG_PATH /app/configs/config.json
 
diff --git a/Dockerfile.zoekt-webserver b/Dockerfile.zoekt-webserver
index 195a5d9e..03f95a60 100644
--- a/Dockerfile.zoekt-webserver
+++ b/Dockerfile.zoekt-webserver
@@ -15,8 +15,8 @@ FROM alpine:3.19 AS zoekt
 WORKDIR /app
 RUN apk add --no-cache git ca-certificates bind-tools tini jansson wget
 
-ENV DATA_DIR /zoekt-data/
-RUN mkdir -p ${DATA_DIR}
+ENV ZOEKT_DATA_CACHE_DIR /zoekt-data/
+RUN mkdir -p ${ZOEKT_DATA_CACHE_DIR}
 
 COPY entrypoint.zoekt-webserver.sh ./entrypoint.sh
 RUN chmod +x ./entrypoint.sh
diff --git a/configs/config.json b/configs/config.json
index 769db6ba..e686f93c 100644
--- a/configs/config.json
+++ b/configs/config.json
@@ -2,5 +2,8 @@
     {
         "GithubOrg": "TaqlaAI",
         "NoArchived": true
+    },
+    {
+        "GithubOrg": "basetenlabs"
     }
 ]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e3f354e5..3cba1b96 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,18 +14,18 @@ services:
     environment:
       - GITHUB_TOKEN=${GITHUB_TOKEN}
       - CONFIG_PATH=/app/configs/config.json
-      - DATA_DIR=/zoekt-data/
+      - ZOEKT_DATA_CACHE_DIR=/zoekt-data/
     volumes:
       - ./configs/config.json:/app/configs/config.json:r
-      - zoekt_index_cache:/zoekt-data/
+      - zoekt_data_cache:/zoekt-data/
 
   zoekt-webserver:
     build:
       dockerfile: Dockerfile.zoekt-webserver
     environment:
-      - DATA_DIR=/zoekt-data/
+      - ZOEKT_DATA_CACHE_DIR=/zoekt-data/
     volumes:
-      - zoekt_index_cache:/zoekt-data/
+      - zoekt_data_cache:/zoekt-data/
   
 volumes:
-  zoekt_index_cache:
\ No newline at end of file
+  zoekt_data_cache:
\ No newline at end of file
diff --git a/entrypoint.zoekt-indexserver.sh b/entrypoint.zoekt-indexserver.sh
index 2d89ddcb..8c7c5d85 100644
--- a/entrypoint.zoekt-indexserver.sh
+++ b/entrypoint.zoekt-indexserver.sh
@@ -13,4 +13,4 @@ else
     echo -e "\e[33mWarning: Private GitHub repositories will not be indexed since GITHUB_TOKEN was not set. If you are not using GitHub, disregard.\e[0m"
 fi
 
-exec "zoekt-indexserver" "-data_dir" "${DATA_DIR}" "-mirror_config" "${CONFIG_PATH}"
+exec "zoekt-indexserver" "-data_dir" "${ZOEKT_DATA_CACHE_DIR}" "-mirror_config" "${CONFIG_PATH}"
diff --git a/entrypoint.zoekt-webserver.sh b/entrypoint.zoekt-webserver.sh
index 58624537..641cddd7 100644
--- a/entrypoint.zoekt-webserver.sh
+++ b/entrypoint.zoekt-webserver.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 set -e
 
-exec "zoekt-webserver" "-index" "${DATA_DIR}/index"
\ No newline at end of file
+exec "zoekt-webserver" "-index" "${ZOEKT_DATA_CACHE_DIR}/index"
\ No newline at end of file