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

Permite editar el ajuste de --resolve-image 

En Docker Swarm, a veces conviene ignorar la plataforma en la que se
construyó una imagen Docker, porque sabemos que su contenido es apto
para nuestra arquitectura. Este nuevo ajuste (SWARM_RESOLVE_IMAGE)
permite ignorar restricciones que impidan el despliegue en ese sentido.
parent c2e85293

README.md

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ You may define these environment variables (**bold** are mandatory): 
* *ENV_SPACE_REPLACEMENT*: Unique string (change this if that is not true for you) used to replace spaces into variable values while handling them. Default `<dd-space>`.

* *FORCE_DOCKER_COMPOSE*: Use always standard (*docker-compose*) mode instead of Docker *Swarm*, even if it is available on remote Docker environment. Default `0`.

* *OMIT_CLEAN_DEPLOY*: Leave at remote host deployment resources after doing a successful deploy. Useful when using bind mounts or *docker-compose* secrets (pointing to static content in deployment resources). Default `0`.

* *SWARM_RESOLVE_IMAGE*: Allow edit behaviour of query the registry to resolve image digest and supported platforms ("always"|"changed"|"never"). Default `always`.

* *GREP_BIN*: Path to *grep* binary in remote host. Default `grep`.

* *REGISTRY_PASS*: Docker registry password, corresponding to a user with read permissions. **Required** for private registry or repository.

* *REGISTRY_URL*: Docker registry address, where Docker must log in to retrieve images. Useful only when using private registry or repository. Default is empty, to use Docker Hub registry.

script/_definitions.sh

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ DEPLOY_DIR_NAME="${DEPLOY_DIR_NAME:-deploy}" 
DEFAULT_DEPLOY_FILES="${DEFAULT_DEPLOY_FILES:-docker-compose*.yml .env}"

FORCE_DOCKER_COMPOSE="${FORCE_DOCKER_COMPOSE:-0}"

OMIT_CLEAN_DEPLOY="${OMIT_CLEAN_DEPLOY:-0}"

SWARM_RESOLVE_IMAGE="${SWARM_RESOLVE_IMAGE:-always}"



STATUS_CHECK_RETRIES="${STATUS_CHECK_RETRIES:-10}"

STATUS_CHECK_INTERVAL="${STATUS_CHECK_INTERVAL:-20}"

script/_do-deploy.sh

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ deployCmd="\ 
		swarmComposeFileSplitted=\$(echo ${COMPOSE_FILE} | sed 's/:/ -c /g') && \

		${GREP_BIN} -v '^[#| ]' .env | sed -r \"s/(\w+)=(.*)/export \1='\2'/g\" > .env-deploy && \

		env -i /bin/sh -c \". \$(pwd)/.env-deploy && \

			docker stack deploy \${deployAuthParam} -c \${swarmComposeFileSplitted} ${STACK}\" && \

			docker stack deploy \${deployAuthParam} --resolve-image ${SWARM_RESOLVE_IMAGE} -c \${swarmComposeFileSplitted} ${STACK}\" && \

		if [ ! -z \"\${deployAuthParam}\" ] ; \

		then \

			servicesToAuth=\"${SERVICES_TO_AUTH}\" && \