Skip to content

Commit ceb2ff4

Browse files
chore: delete docker container if the env vars isn't the same line of keys
1 parent 2cbd57d commit ceb2ff4

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

docker-shell-id/tool.gpt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ ID=$(echo $GPTSCRIPT_WORKSPACE_ID | shasum -a 256 | awk '{print $1}')
1010
# Find docker container from shell.obot.ai label
1111
CID=$(docker ps -qa --filter label=shell.obot.ai="$ID")
1212

13+
if [ -n "$CID" ] && [ "$OBOT_THREAD_ENVS" != "$(docker inspect -f '{{ index .Config.Labels "threadenv.obot.ai" }}' $CID)" ]; then
14+
docker rm -f $CID > /dev/null
15+
CID=""
16+
fi
17+
1318
if [ -n "$CID" ]; then
1419
if [ "${START}" = "false" ]; then
1520
echo $CID
@@ -32,4 +37,7 @@ if [ "${START}" = "false" ]; then
3237
CMD=create
3338
fi
3439

35-
docker $CMD --rm --label shell.obot.ai="$ID" --label "user.obot.ai=${OBOT_USER_ID}" --name "obot-shell-${OBOT_USER_ID}-${RANDOM}" -q -it ${OBOT_VOLUMES} ${OBOT_SHELL_RUN_ARGS} ${OBOT_SHELL_IMAGE:-alpine}
40+
docker $CMD --rm --label shell.obot.ai="$ID" \
41+
--label "threadenv.obot.ai=${OBOT_THREAD_ENVS}" \
42+
--label "user.obot.ai=${OBOT_USER_ID}" \
43+
--name "obot-shell-${OBOT_USER_ID}-${RANDOM}" -q -it ${OBOT_VOLUMES} ${OBOT_SHELL_RUN_ARGS} ${OBOT_SHELL_IMAGE:-alpine}

docker/tool.gpt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,10 @@ if [ -n "$TARGET_FILE" ]; then
5656
OBOT_TOOL_RUN_ARGS="${OBOT_TOOL_RUN_ARGS} -v $TEMPFILE:$TARGET_FILE"
5757
fi
5858

59+
if [ -n "$OBOT_THREAD_ENVS" ]; then
60+
for env in $(echo $OBOT_THREAD_ENVS | tr "," "\n"); do
61+
OBOT_TOOL_RUN_ARGS="${OBOT_TOOL_RUN_ARGS} -e $env"
62+
done
63+
fi
64+
5965
docker run -q --rm --label tool.thread.obot.ai="$OBOT_THREAD_ID" -e GPTSCRIPT_INPUT ${OBOT_TOOL_RUN_ARGS} "${OBOT_TOOL_IMAGE}" ${INTERPRETER} ${TARGET_FILE}

0 commit comments

Comments
 (0)