Commit b368a75a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Usa nombre de fichero .env en ficheros por defecto 

Emplea la variable COMPOSE_ENV_FILE_NAME también en la definición de
ficheros de configuración de despliegue por defecto,
DEFAULT_DEPLOY_FILES.
parent faaa84b1

README.md

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ You may define these environment variables (**bold** are mandatory): 
| **STACK** | - | Name of Docker stack (*Swarm* mode) or project (*Compose* mode) used to wrap deployed services. |

| *COMPOSE_ENV_FILE_NAME* | `.env` | Name of variable values definition file. |

| *COMPOSE_FILE* | `compose.yaml` | Name of service definition file. Multiple files are supported, separated by colon (`:`). |

| *DEFAULT_DEPLOY_FILES* | `*compose*.y*ml .env` | Files needed for deployment. Used only if `DEPLOY_DIR_NAME` directory does not exist. |

| *DEFAULT_DEPLOY_FILES* | `*compose*.y*ml ${COMPOSE_ENV_FILE_NAME}` | Files needed for deployment. Used only if `DEPLOY_DIR_NAME` directory does not exist. |

| *DEPLOY_DIR_NAME* | `deploy` | Name of directory containing files needed for deployment. If directory exists, `DEFAULT_DEPLOY_FILES` is ignored and all contents are copied to deployment target host. |

| *DEPLOY_PATH* | `~` | Path in deployment target host where deployment directory (used to hold temporary files) will be created. |

| *ENV_PREFIX* | `DD_` | Prefix used to identify variables to be defined in deployment target host environment and service, available there without this prefix. Change this if default value collides with the beginning of your variable names. |

script/_definitions.sh

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ COMPOSE_FILE="${COMPOSE_FILE:-compose.yaml}" 
COMPOSE_ENV_FILE_NAME="${COMPOSE_ENV_FILE_NAME:-.env}"

DEPLOY_PATH="${DEPLOY_PATH:-~}"

DEPLOY_DIR_NAME="${DEPLOY_DIR_NAME:-deploy}"

DEFAULT_DEPLOY_FILES="${DEFAULT_DEPLOY_FILES:-*compose*.y*ml .env}"

DEFAULT_DEPLOY_FILES="${DEFAULT_DEPLOY_FILES:-*compose*.y*ml ${COMPOSE_ENV_FILE_NAME}}"

FORCE_DOCKER_COMPOSE="${FORCE_DOCKER_COMPOSE:-0}"

OMIT_CLEAN_DEPLOY="${OMIT_CLEAN_DEPLOY:-0}"

SWARM_RESOLVE_IMAGE="${SWARM_RESOLVE_IMAGE:-always}"