Update CI/CD for production (a131b176) · Commits · e / infra / spot

.gitlab-ci.yml

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -70,6 +70,9 @@ test:unit:
	- chmod 700 ~/.ssh		- chmod 700 ~/.ssh
	- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts		- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
	- chmod 644 ~/.ssh/known_hosts		- chmod 644 ~/.ssh/known_hosts
			- ssh $DOCKER_HOST "mkdir -p $(dirname $FILTRON_RULES) && echo '$(cat ./etc/filtron/rules.json)' > $FILTRON_RULES"
			- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
			- docker pull registry.gitlab.e.foundation:5000/e/cloud/my-spot/env

	deploy:spot.test.cloud.global:		deploy:spot.test.cloud.global:
	extends: .deploy:template		extends: .deploy:template
	@@ -88,10 +91,8 @@ deploy:spot.test.cloud.global:
	COMPOSE_PROJECT_NAME: my-spot		COMPOSE_PROJECT_NAME: my-spot
	SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY_TEST}		SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY_TEST}
	script:		script:
	- ssh $DOCKER_HOST "mkdir -p /etc/filtron && echo '$(cat ./etc/filtron/rules.json)' > $FILTRON_RULES"
	- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
	- docker pull registry.gitlab.e.foundation:5000/e/cloud/my-spot/env
	- docker-compose up -d --build --scale tor=5		- docker-compose up -d --build --scale tor=5
			- docker-compose restart filtron

	deploy:spot.cloud.global:		deploy:spot.cloud.global:
	extends: .deploy:template		extends: .deploy:template
	@@ -101,8 +102,8 @@ deploy:spot.cloud.global:
	name: prod		name: prod
	url: https://spot.ecloud.global		url: https://spot.ecloud.global
	variables:		variables:
	DOCKER_HOST: ssh://root@spot.ecloud.global		DOCKER_HOST: ssh://spot@spot.ecloud.global
	FILTRON_RULES: /etc/filtron/rules.json		FILTRON_RULES: /home/spot/filtron/rules.json
	SPOT_HOSTNAME: spot.ecloud.global		SPOT_HOSTNAME: spot.ecloud.global
	SPOT_MORTY_HOSTNAME: proxy.spot.ecloud.global		SPOT_MORTY_HOSTNAME: proxy.spot.ecloud.global
	SPOT_MORTY_URL: https://proxy.spot.ecloud.global		SPOT_MORTY_URL: https://proxy.spot.ecloud.global
	@@ -111,8 +112,6 @@ deploy:spot.cloud.global:
	SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}		SPOT_NGINX_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
	SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY_PROD}		SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY_PROD}
	script:		script:
	- ssh $DOCKER_HOST "mkdir -p /etc/filtron && echo '$(cat ./etc/filtron/rules.json)' > $FILTRON_RULES"
	- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
	- docker pull registry.gitlab.e.foundation:5000/e/cloud/my-spot/env
	- docker-compose pull		- docker-compose pull
	- docker-compose up -d --scale tor=5		- docker-compose up -d --scale tor=5
			- docker-compose restart filtron