Skip to content

Commit ccb2334

Browse files
authored
Merge branch 'main' into dev
2 parents 07fb3f5 + a2ed623 commit ccb2334

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

deployment/docker-compose/arthur-engine/start.sh.template

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
#!/bin/bash
22

33
cat <<EOF > .env
4-
<<<<<<< HEAD
5-
GENAI_ENGINE_OPENAI_PROVIDER=Azure
6-
GENAI_ENGINE_OPENAI_GPT_NAMES_ENDPOINTS_KEYS=model_name::https://my_service.openai.azure.com/::my_api_key
7-
=======
84
GENAI_ENGINE_OPENAI_PROVIDER=OpenAI
95
GENAI_ENGINE_OPENAI_GPT_NAMES_ENDPOINTS_KEYS=model_name::::my_api_key
10-
>>>>>>> dev
116
GENAI_ENGINE_ADMIN_KEY=changeme_genai_engine_admin_key
127
FETCH_RAW_DATA_ENABLED=true
138
ARTHUR_CLIENT_ID=
Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
#!/bin/bash
22

33
cat <<EOF > .env
4-
<<<<<<< HEAD
5-
GENAI_ENGINE_OPENAI_PROVIDER=Azure
6-
GENAI_ENGINE_OPENAI_GPT_NAMES_ENDPOINTS_KEYS=model_name::https://my_service.openai.azure.com/::my_api_key
7-
=======
84
GENAI_ENGINE_OPENAI_PROVIDER=OpenAI
95
GENAI_ENGINE_OPENAI_GPT_NAMES_ENDPOINTS_KEYS=model_name::::my_api_key
10-
>>>>>>> dev
116
EOF
127

138
curl -s https://raw.githubusercontent.com/arthur-ai/arthur-engine/refs/heads/main/deployment/docker-compose/genai-engine/docker-compose.yml | docker compose -f - up --pull always \

genai-engine/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.41
1+
2.1.41

0 commit comments

Comments
 (0)