Merge branch 'dev' of gitlab.com:redmic-project/gis/sftp into dev (31fbd073) · Commits · REDMIC Project / GIS / SFTP

.env

+1 −1

Original line number	Diff line number	Diff line
		PORT=2222
		PUBLIC_PORT=2222

.gitlab-ci.yml

+38 −17

Original line number	Diff line number	Diff line
		image: docker:stable
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

		stages:
		- deploy

		variables:
		DOCKER_DRIVER: overlay2

		services:
		- docker:dind

		deploy-dev:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		STACK: gis
		SERVICES_TO_CHECK: gis_${CI_PROJECT_NAME}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		SFTP_USERS: ${DEV_SFTP_USERS}
		services:
		- docker:dind
		PUBLIC_PORT: ${DEV_PUBLIC_PORT}
		script:
		- >
		deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS}
		deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS} PUBLIC_PORT=${PUBLIC_PORT}
		environment:
		name: dev
		only:
		- branches
		- dev
		when: manual

		deploy-supporting-branch:
		stage: deploy
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		STACK: gis
		SERVICES_TO_CHECK: gis_${CI_PROJECT_NAME}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		SFTP_USERS: ${DEV_SFTP_USERS}
		PUBLIC_PORT: ${DEV_PUBLIC_PORT}
		script:
		- >
		deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS} PUBLIC_PORT=${PUBLIC_PORT}
		environment:
		name: dev
		only:
		- branches
		except:
		- master
		- dev
		when: manual

		deploy-pro:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		STACK: gis
		SERVICES_TO_CHECK: gis_${CI_PROJECT_NAME}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		SFTP_USERS: ${PRO_SFTP_USERS}
		services:
		- docker:dind
		PUBLIC_PORT: ${PRO_PUBLIC_PORT}
		script:
		- >
		deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS}
		PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME}
		deploy.sh COMPOSE_FILE=${COMPOSE_FILE} SFTP_USERS=${SFTP_USERS} PUBLIC_PORT=${PUBLIC_PORT}
		environment:
		name: master
		name: pro
		only:
		- master
		when: manual

docker-compose.prod.yml

+0 −7

Original line number	Diff line number	Diff line
		version: '3.5'

		services:
		sftp:
		deploy:
		placement:
		constraints:
		- node.role == manager

		volumes:
		geoserver-vol:
		name: geoserver-maxio-vol

docker-compose.tmpl.yml

+18 −3

Original line number	Diff line number	Diff line
		@@ -3,8 +3,13 @@ version: '3.5'
		services:
		sftp:
		image: atmoz/sftp:alpine
		command: "${SFTP_USERS}"
		networks:
		- gis-net
		ports:
		- "${PORT}:22"
		- target: 22
		published: ${PUBLIC_PORT}
		mode: host
		volumes:
		- geoserver-vol:/home/geoserver/geoserver
		command: "${SFTP_USERS}"
		@@ -15,5 +20,15 @@ services:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		max_attempts: 3
		No newline at end of file
		delay: 30s
		window: 1m
		resources:
		limits:
		cpus: '0.5'
		memory: 64M
		reservations:
		memory: 52M

		networks:
		gis-net:
		external: true