Get rid of unnecessary EBMBOT_PATH setting, which was breaking things…

… in docker anyway
bennettoxford · Dec 15, 2023 · 0b2b8d2 · 0b2b8d2
1 parent 906788e
commit 0b2b8d2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -89,7 +89,7 @@ WORKDIR /app
 
 # This may not be necessary, but it probably doesn't hurt
 ENV PYTHONPATH=/app
-
+ENV PATH=$PATH:/app
 
 ##################################################
 #

diff --git a/ebmbot/dispatcher.py b/ebmbot/dispatcher.py
@@ -122,7 +122,7 @@ def run_command(self):
                         stderr=stderr,
                         env={
                             "EBMBOT_CALLBACK_URL": self.callback_url,
-                            "PATH": settings.EBMBOT_PATH or os.environ["PATH"],
+                            "PATH": os.environ["PATH"],
                         },
                         shell=True,
                     )

diff --git a/ebmbot/settings.py b/ebmbot/settings.py
@@ -7,8 +7,6 @@
 env.read_env()
 
 APPLICATION_ROOT = Path(__file__).resolve().parent.parent
-# If running in docker, this is /app/
-EBMBOT_PATH = env.str("EBMBOT_PATH", default=APPLICATION_ROOT)
 
 DB_PATH = env.path("DB_PATH", default=APPLICATION_ROOT / "ebmbot.db")
 WORKSPACE_DIR = env.path("WORKSPACE_DIR", default=APPLICATION_ROOT / "workspace")