Merge branch 'feature/refinement_selection_specialist' into develop
This commit is contained in:
@@ -67,23 +67,28 @@ case $ENVIRONMENT in
|
||||
dev)
|
||||
PODMAN_CONNECTION="default"
|
||||
COMPOSE_FILE="compose_dev.yaml"
|
||||
REGISTRY_PREFIX=""
|
||||
COMPOSE_PROJECT_NAME="eveai_dev"
|
||||
VERSION="latest" # Always use latest for dev
|
||||
;;
|
||||
prod)
|
||||
# TO BE DEFINED
|
||||
PODMAN_CONNECTION="mxz536.stackhero-network.com"
|
||||
COMPOSE_FILE="compose_stackhero.yaml"
|
||||
REGISTRY_PREFIX=""
|
||||
COMPOSE_PROJECT_NAME="eveai_prod"
|
||||
;;
|
||||
test)
|
||||
PODMAN_CONNECTION="test-environment"
|
||||
COMPOSE_FILE="compose_test.yaml"
|
||||
;;
|
||||
integration)
|
||||
PODMAN_CONNECTION="integration-environment"
|
||||
COMPOSE_FILE="compose_integration.yaml"
|
||||
REGISTRY_PREFIX="registry.ask-eve-ai-local.com/"
|
||||
COMPOSE_PROJECT_NAME="eveai_test"
|
||||
;;
|
||||
bugfix)
|
||||
# TO BE DEFINED
|
||||
PODMAN_CONNECTION="bugfix-environment"
|
||||
COMPOSE_FILE="compose_bugfix.yaml"
|
||||
COMPOSE_PROJECT_NAME="eveai_bugfix"
|
||||
;;
|
||||
*)
|
||||
echo "Invalid environment: $ENVIRONMENT"
|
||||
@@ -171,59 +176,61 @@ export EVEAI_VERSION=$VERSION
|
||||
export CONTAINER_ACCOUNT=$CONTAINER_ACCOUNT
|
||||
export CONTAINER_CMD=$CONTAINER_CMD
|
||||
export COMPOSE_CMD_PATH=$COMPOSE_CMD_PATH
|
||||
export REGISTRY_PREFIX=$REGISTRY_PREFIX
|
||||
export COMPOSE_PROJECT_NAME=$COMPOSE_PROJECT_NAME
|
||||
|
||||
echo "Set COMPOSE_FILE to $COMPOSE_FILE"
|
||||
echo "Set EVEAI_VERSION to $VERSION"
|
||||
echo "Set CONTAINER_ACCOUNT to $CONTAINER_ACCOUNT"
|
||||
echo "Set platform to AMD64 (linux/amd64)"
|
||||
echo "Set registry prefix to $REGISTRY_PREFIX"
|
||||
echo "Set project name to $COMPOSE_PROJECT_NAME"
|
||||
|
||||
# Define compose wrapper functions using the full path to avoid recursion
|
||||
pc() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE "$@"
|
||||
}
|
||||
|
||||
pcup() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE up -d --remove-orphans "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE up -d --remove-orphans "$@"
|
||||
}
|
||||
|
||||
pcdown() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE down "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE down "$@"
|
||||
}
|
||||
|
||||
pcps() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE ps "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE ps "$@"
|
||||
}
|
||||
|
||||
pclogs() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE logs "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE logs "$@"
|
||||
}
|
||||
|
||||
# Simplified pull - no platform tricks needed
|
||||
pcpull() {
|
||||
echo "Pulling AMD64 images..."
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE pull "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE pull "$@"
|
||||
}
|
||||
|
||||
pcrefresh() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE pull && $COMPOSE_CMD_PATH -f $COMPOSE_FILE up -d --remove-orphans "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE pull && $COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE up -d --remove-orphans "$@"
|
||||
}
|
||||
|
||||
pcbuild() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE build "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE build "$@"
|
||||
}
|
||||
|
||||
pcrestart() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE restart "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE restart "$@"
|
||||
}
|
||||
|
||||
pcstop() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE stop "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE stop "$@"
|
||||
}
|
||||
|
||||
pcstart() {
|
||||
$COMPOSE_CMD_PATH -f $COMPOSE_FILE start "$@"
|
||||
$COMPOSE_CMD_PATH -p ${COMPOSE_PROJECT_NAME} -f $COMPOSE_FILE start "$@"
|
||||
}
|
||||
|
||||
# Export functions - handle both bash and zsh
|
||||
if [[ -n "$ZSH_VERSION" ]]; then
|
||||
# In zsh, functions are automatically available in subshells
|
||||
|
||||
Reference in New Issue
Block a user