Commit 02d999e1 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Permite no definir registry para usar Docker Hub

parent 3ddfe227
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ For environment variables, you may define these variables (**bold** are mandator
* *DEPLOY_PATH*: Path in remote host where deployment directory (containing temporary files) will be created. Default `~`.
* *DEPLOY_DIR_NAME*: Name of directory containing files needed for deployment. Default `deploy`.
* *DEFAULT_DEPLOY_FILES*: Files needed for deployment, if `${DEPLOY_DIR_NAME}` does not exist. Default `docker-compose*.yml .env`.
* *REGISTRY_URL*: Address of Docker registry where Docker images to deploy are stored. Required for private registries.
* *REGISTRY_USER*: Docker registry username of user with read permissions. Required for private registries.
* *REGISTRY_PASS*: Docker registry user password of user with read permissions. Required for private registries.
* *REGISTRY_URL*: Address of Docker registry where Docker images to deploy are stored. Leave it empty to use Docker Hub registry.
* *REGISTRY_USER*: Docker registry username of user with read permissions. **Required** for private registries.
* *REGISTRY_PASS*: Docker registry user password of user with read permissions. **Required** for private registries.
* *SERVICES_TO_CHECK*: Names of services to check after deployment, separated by space.
* *STATUS_CHECK_RETRIES*: Default `10`.
* *STATUS_CHECK_INTERVAL*: Default `20`.
+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ echo -e "\n${INFO_COLOR}Deploying at remote target ${DATA_COLOR}${remoteHost}${I

deployCmd="\
	cd ${DEPLOY_HOME} && \
	if [ ! -z \"${REGISTRY_USER}\" -a ! -z \"${REGISTRY_PASS}\" -a ! -z \"${REGISTRY_URL}\" ] ; \
	if [ ! -z \"${REGISTRY_USER}\" ] ; \
	then \
		docker login -u ${REGISTRY_USER} -p ${REGISTRY_PASS} ${REGISTRY_URL} ; \
		docker login -u \"${REGISTRY_USER}\" -p \"${REGISTRY_PASS}\" ${REGISTRY_URL} ; \
		deployAuthParam=\"--with-registry-auth\" ; \
	else \
		deployAuthParam=\"\" ; \
+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ relaunchCmd="\
		echo -e \"${FAIL_COLOR}Service image not found!${NULL_COLOR}\" && \
		exit 1 ; \
	fi ; \
	if [ ! -z \"${REGISTRY_USER}\" -a ! -z \"${REGISTRY_PASS}\" -a ! -z \"${REGISTRY_URL}\" ] ; \
	if [ ! -z \"${REGISTRY_USER}\" ] ; \
	then \
		docker login -u ${REGISTRY_USER} -p ${REGISTRY_PASS} ${REGISTRY_URL} ; \
		docker login -u \"${REGISTRY_USER}\" -p \"${REGISTRY_PASS}\" ${REGISTRY_URL} ; \
	fi ; \
	docker pull \${imageNameAndTag} && \
	imageDigest=\$(docker images --digests --format '{{.Digest}}' \${imageName} | head -1) && \