Skip to content

Commit 51fd44f

Browse files
deploy error fix
deploy error fix
1 parent 996ec46 commit 51fd44f

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

.github/workflows/azure-container-webapp.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,28 @@ jobs:
7878
- name: Build and Push Docker Images
7979
run: |
8080
echo "→ Substituting placeholders in $DOCKER_COMPOSE_PATH..."
81-
sed -i \
82-
-e "s|\\\$***REGISTRY_LOGIN_SERVER***|$REGISTRY_LOGIN_SERVER|g" \
83-
-e "s|\\\$***OPENAI_API_TYPE***|$OPENAI_API_TYPE|g" \
84-
-e "s|\\\$***AZURE_OPENAI_ENDPOINT***|$AZURE_OPENAI_ENDPOINT|g" \
85-
-e "s|\\\$***AZURE_OPENAI_API_KEY***|$AZURE_OPENAI_API_KEY|g" \
86-
-e "s|\\\$***AZURE_OPENAI_API_VERSION***|$AZURE_OPENAI_API_VERSION|g" \
87-
-e "s|\\\$***AZURE_DEPLOYMENT_NAME***|$AZURE_DEPLOYMENT_NAME|g" \
88-
-e "s|\\\$***AZURE_EMBEDDING_MODEL***|$AZURE_EMBEDDING_MODEL|g" \
89-
-e "s|\\\$***AZURE_OPENAI_ENDPOINT_EMBED***|$AZURE_OPENAI_ENDPOINT_EMBED|g" \
90-
-e "s|\\\$***AZURE_OPENAI_API_KEY_EMBED***|$AZURE_OPENAI_API_KEY_EMBED|g" \
91-
-e "s|\\\$***AZURE_EMBEDDING_DEPLOYMENT_NAME***|$AZURE_EMBEDDING_DEPLOYMENT_NAME|g" \
92-
-e "s|\\\$***AZURE_OPENAI_API_VERSION_EMBED***|$AZURE_OPENAI_API_VERSION_EMBED|g" \
93-
-e "s|\\\$***DB_USERNAME***|$DB_USERNAME|g" \
94-
-e "s|\\\$***DB_PASSWORD***|$DB_PASSWORD|g" \
95-
-e "s|\\\$***DB_NAME***|$DB_NAME|g" \
96-
-e "s|\\\$***DB_HOST***|$DB_HOST|g" \
97-
-e "s|\\\$***DB_PORT***|$DB_PORT|g" \
98-
-e "s|\\\$***SECRET_KEY***|$SECRET_KEY|g" \
99-
-e "s|\\\$***AZURE_BLOB_CONNECTION_STRING***|$AZURE_BLOB_CONNECTION_STRING|g" \
100-
-e "s|\\\$***AZURE_BLOB_KB***|$AZURE_BLOB_KB|g" \
101-
-e "s|\\\$***AZURE_BLOB_UPLOAD***|$AZURE_BLOB_UPLOAD|g" \
102-
"$DOCKER_COMPOSE_PATH"
81+
82+
# Use individual sed commands with proper escaping
83+
sed -i "s/\$\*\*\*REGISTRY_LOGIN_SERVER\*\*\*/$REGISTRY_LOGIN_SERVER/g" "$DOCKER_COMPOSE_PATH"
84+
sed -i "s/\$\*\*\*OPENAI_API_TYPE\*\*\*/$OPENAI_API_TYPE/g" "$DOCKER_COMPOSE_PATH"
85+
sed -i "s/\$\*\*\*AZURE_OPENAI_ENDPOINT\*\*\*/$AZURE_OPENAI_ENDPOINT/g" "$DOCKER_COMPOSE_PATH"
86+
sed -i "s/\$\*\*\*AZURE_OPENAI_API_KEY\*\*\*/$AZURE_OPENAI_API_KEY/g" "$DOCKER_COMPOSE_PATH"
87+
sed -i "s/\$\*\*\*AZURE_OPENAI_API_VERSION\*\*\*/$AZURE_OPENAI_API_VERSION/g" "$DOCKER_COMPOSE_PATH"
88+
sed -i "s/\$\*\*\*AZURE_DEPLOYMENT_NAME\*\*\*/$AZURE_DEPLOYMENT_NAME/g" "$DOCKER_COMPOSE_PATH"
89+
sed -i "s/\$\*\*\*AZURE_EMBEDDING_MODEL\*\*\*/$AZURE_EMBEDDING_MODEL/g" "$DOCKER_COMPOSE_PATH"
90+
sed -i "s/\$\*\*\*AZURE_OPENAI_ENDPOINT_EMBED\*\*\*/$AZURE_OPENAI_ENDPOINT_EMBED/g" "$DOCKER_COMPOSE_PATH"
91+
sed -i "s/\$\*\*\*AZURE_OPENAI_API_KEY_EMBED\*\*\*/$AZURE_OPENAI_API_KEY_EMBED/g" "$DOCKER_COMPOSE_PATH"
92+
sed -i "s/\$\*\*\*AZURE_EMBEDDING_DEPLOYMENT_NAME\*\*\*/$AZURE_EMBEDDING_DEPLOYMENT_NAME/g" "$DOCKER_COMPOSE_PATH"
93+
sed -i "s/\$\*\*\*AZURE_OPENAI_API_VERSION_EMBED\*\*\*/$AZURE_OPENAI_API_VERSION_EMBED/g" "$DOCKER_COMPOSE_PATH"
94+
sed -i "s/\$\*\*\*DB_USERNAME\*\*\*/$DB_USERNAME/g" "$DOCKER_COMPOSE_PATH"
95+
sed -i "s/\$\*\*\*DB_PASSWORD\*\*\*/$DB_PASSWORD/g" "$DOCKER_COMPOSE_PATH"
96+
sed -i "s/\$\*\*\*DB_NAME\*\*\*/$DB_NAME/g" "$DOCKER_COMPOSE_PATH"
97+
sed -i "s/\$\*\*\*DB_HOST\*\*\*/$DB_HOST/g" "$DOCKER_COMPOSE_PATH"
98+
sed -i "s/\$\*\*\*DB_PORT\*\*\*/$DB_PORT/g" "$DOCKER_COMPOSE_PATH"
99+
sed -i "s/\$\*\*\*SECRET_KEY\*\*\*/$SECRET_KEY/g" "$DOCKER_COMPOSE_PATH"
100+
sed -i "s/\$\*\*\*AZURE_BLOB_CONNECTION_STRING\*\*\*/$AZURE_BLOB_CONNECTION_STRING/g" "$DOCKER_COMPOSE_PATH"
101+
sed -i "s/\$\*\*\*AZURE_BLOB_KB\*\*\*/$AZURE_BLOB_KB/g" "$DOCKER_COMPOSE_PATH"
102+
sed -i "s/\$\*\*\*AZURE_BLOB_UPLOAD\*\*\*/$AZURE_BLOB_UPLOAD/g" "$DOCKER_COMPOSE_PATH"
103103
104104
echo "→ Final compose file (for debugging):"
105105
cat "$DOCKER_COMPOSE_PATH"

migration-deploy-config.yml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,28 @@ jobs:
7878
- name: Build and Push Docker Images
7979
run: |
8080
echo "→ Substituting placeholders in $DOCKER_COMPOSE_PATH..."
81-
sed -i \
82-
-e "s|\\\$***REGISTRY_LOGIN_SERVER***|$REGISTRY_LOGIN_SERVER|g" \
83-
-e "s|\\\$***OPENAI_API_TYPE***|$OPENAI_API_TYPE|g" \
84-
-e "s|\\\$***AZURE_OPENAI_ENDPOINT***|$AZURE_OPENAI_ENDPOINT|g" \
85-
-e "s|\\\$***AZURE_OPENAI_API_KEY***|$AZURE_OPENAI_API_KEY|g" \
86-
-e "s|\\\$***AZURE_OPENAI_API_VERSION***|$AZURE_OPENAI_API_VERSION|g" \
87-
-e "s|\\\$***AZURE_DEPLOYMENT_NAME***|$AZURE_DEPLOYMENT_NAME|g" \
88-
-e "s|\\\$***AZURE_EMBEDDING_MODEL***|$AZURE_EMBEDDING_MODEL|g" \
89-
-e "s|\\\$***AZURE_OPENAI_ENDPOINT_EMBED***|$AZURE_OPENAI_ENDPOINT_EMBED|g" \
90-
-e "s|\\\$***AZURE_OPENAI_API_KEY_EMBED***|$AZURE_OPENAI_API_KEY_EMBED|g" \
91-
-e "s|\\\$***AZURE_EMBEDDING_DEPLOYMENT_NAME***|$AZURE_EMBEDDING_DEPLOYMENT_NAME|g" \
92-
-e "s|\\\$***AZURE_OPENAI_API_VERSION_EMBED***|$AZURE_OPENAI_API_VERSION_EMBED|g" \
93-
-e "s|\\\$***DB_USERNAME***|$DB_USERNAME|g" \
94-
-e "s|\\\$***DB_PASSWORD***|$DB_PASSWORD|g" \
95-
-e "s|\\\$***DB_NAME***|$DB_NAME|g" \
96-
-e "s|\\\$***DB_HOST***|$DB_HOST|g" \
97-
-e "s|\\\$***DB_PORT***|$DB_PORT|g" \
98-
-e "s|\\\$***SECRET_KEY***|$SECRET_KEY|g" \
99-
-e "s|\\\$***AZURE_BLOB_CONNECTION_STRING***|$AZURE_BLOB_CONNECTION_STRING|g" \
100-
-e "s|\\\$***AZURE_BLOB_KB***|$AZURE_BLOB_KB|g" \
101-
-e "s|\\\$***AZURE_BLOB_UPLOAD***|$AZURE_BLOB_UPLOAD|g" \
102-
"$DOCKER_COMPOSE_PATH"
81+
82+
# Use individual sed commands with proper escaping
83+
sed -i "s/\$\*\*\*REGISTRY_LOGIN_SERVER\*\*\*/$REGISTRY_LOGIN_SERVER/g" "$DOCKER_COMPOSE_PATH"
84+
sed -i "s/\$\*\*\*OPENAI_API_TYPE\*\*\*/$OPENAI_API_TYPE/g" "$DOCKER_COMPOSE_PATH"
85+
sed -i "s/\$\*\*\*AZURE_OPENAI_ENDPOINT\*\*\*/$AZURE_OPENAI_ENDPOINT/g" "$DOCKER_COMPOSE_PATH"
86+
sed -i "s/\$\*\*\*AZURE_OPENAI_API_KEY\*\*\*/$AZURE_OPENAI_API_KEY/g" "$DOCKER_COMPOSE_PATH"
87+
sed -i "s/\$\*\*\*AZURE_OPENAI_API_VERSION\*\*\*/$AZURE_OPENAI_API_VERSION/g" "$DOCKER_COMPOSE_PATH"
88+
sed -i "s/\$\*\*\*AZURE_DEPLOYMENT_NAME\*\*\*/$AZURE_DEPLOYMENT_NAME/g" "$DOCKER_COMPOSE_PATH"
89+
sed -i "s/\$\*\*\*AZURE_EMBEDDING_MODEL\*\*\*/$AZURE_EMBEDDING_MODEL/g" "$DOCKER_COMPOSE_PATH"
90+
sed -i "s/\$\*\*\*AZURE_OPENAI_ENDPOINT_EMBED\*\*\*/$AZURE_OPENAI_ENDPOINT_EMBED/g" "$DOCKER_COMPOSE_PATH"
91+
sed -i "s/\$\*\*\*AZURE_OPENAI_API_KEY_EMBED\*\*\*/$AZURE_OPENAI_API_KEY_EMBED/g" "$DOCKER_COMPOSE_PATH"
92+
sed -i "s/\$\*\*\*AZURE_EMBEDDING_DEPLOYMENT_NAME\*\*\*/$AZURE_EMBEDDING_DEPLOYMENT_NAME/g" "$DOCKER_COMPOSE_PATH"
93+
sed -i "s/\$\*\*\*AZURE_OPENAI_API_VERSION_EMBED\*\*\*/$AZURE_OPENAI_API_VERSION_EMBED/g" "$DOCKER_COMPOSE_PATH"
94+
sed -i "s/\$\*\*\*DB_USERNAME\*\*\*/$DB_USERNAME/g" "$DOCKER_COMPOSE_PATH"
95+
sed -i "s/\$\*\*\*DB_PASSWORD\*\*\*/$DB_PASSWORD/g" "$DOCKER_COMPOSE_PATH"
96+
sed -i "s/\$\*\*\*DB_NAME\*\*\*/$DB_NAME/g" "$DOCKER_COMPOSE_PATH"
97+
sed -i "s/\$\*\*\*DB_HOST\*\*\*/$DB_HOST/g" "$DOCKER_COMPOSE_PATH"
98+
sed -i "s/\$\*\*\*DB_PORT\*\*\*/$DB_PORT/g" "$DOCKER_COMPOSE_PATH"
99+
sed -i "s/\$\*\*\*SECRET_KEY\*\*\*/$SECRET_KEY/g" "$DOCKER_COMPOSE_PATH"
100+
sed -i "s/\$\*\*\*AZURE_BLOB_CONNECTION_STRING\*\*\*/$AZURE_BLOB_CONNECTION_STRING/g" "$DOCKER_COMPOSE_PATH"
101+
sed -i "s/\$\*\*\*AZURE_BLOB_KB\*\*\*/$AZURE_BLOB_KB/g" "$DOCKER_COMPOSE_PATH"
102+
sed -i "s/\$\*\*\*AZURE_BLOB_UPLOAD\*\*\*/$AZURE_BLOB_UPLOAD/g" "$DOCKER_COMPOSE_PATH"
103103
104104
echo "→ Final compose file (for debugging):"
105105
cat "$DOCKER_COMPOSE_PATH"

0 commit comments

Comments
 (0)