Use --password-stdin for docker login (7259d017) · Commits · e / infra / spot

.gitlab-ci.yml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ build:web:
	tags:		tags:
	- generic_privileged		- generic_privileged
	before_script:		before_script:
	- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY		- echo $CI_JOB_TOKEN \| docker login -u gitlab-ci-token --password-stdin $CI_REGISTRY
	script:		script:
	- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .		- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
	- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG		- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
	@@ -62,7 +62,7 @@ test:unit:
	- echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts		- echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts
	- chmod 600 ~/.ssh/id_ed25519		- chmod 600 ~/.ssh/id_ed25519
	- chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub		- chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub
	- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY		- echo $CI_JOB_TOKEN \| docker login -u gitlab-ci-token --password-stdin $CI_REGISTRY
	script:		script:
	- echo "Deploying to ($SSH_USER@$BACKEND_HOST)"		- echo "Deploying to ($SSH_USER@$BACKEND_HOST)"
	- ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git fetch && git fetch --tags -f && git checkout $SPOT_COMMIT && git reset --hard && mv docker-compose.prod.yml docker-compose.yml"		- ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git fetch && git fetch --tags -f && git checkout $SPOT_COMMIT && git reset --hard && mv docker-compose.prod.yml docker-compose.yml"