Merge branch 'dev' into 'master' (0379d292) · Commits · REDMIC Project / Service deployment

.gitlab-ci.yml

+1 −66

Original line number	Diff line number	Diff line
		@@ -177,27 +177,6 @@ deploy-minio-dev:
		- dev
		when: manual

		deploy-pgadmin-dev:
		stage: deploy
		variables:
		DEPLOY_DIR_NAME: pgadmin
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		STACK: postgres
		SERVICES_TO_CHECK: postgres_pgadmin
		IMAGE_TAG: latest
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PGADMIN_SETUP_EMAIL=${PGADMIN_SETUP_EMAIL}
		PGADMIN_SETUP_PASSWORD=${PGADMIN_SETUP_PASSWORD} MAIL_USER=${MAIL_USER} MAIL_PASSWORD=${MAIL_PASSWORD}
		PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}
		environment:
		name: dev/pgadmin
		url: https://pgadmin.${DEV_PUBLIC_HOSTNAME}
		only:
		- dev
		when: manual

		deploy-portainer-dev:
		stage: deploy
		variables:
		@@ -241,47 +220,3 @@ deploy-portainer-pro:
		only:
		- master
		when: manual
		No newline at end of file

		deploy-traefik-dev:
		stage: deploy
		variables:
		DEPLOY_DIR_NAME: traefik
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		STACK: traefik
		SERVICES_TO_CHECK: traefik_traefik
		IMAGE_TAG: latest
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		UI_AUTH: ${DEV_UI_AUTH}
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		UI_AUTH=${UI_AUTH}
		environment:
		name: dev/traefik
		url: https://traefik.${DEV_PUBLIC_HOSTNAME}
		only:
		- dev
		when: manual

		deploy-traefik-pro:
		stage: deploy
		variables:
		DEPLOY_DIR_NAME: traefik
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		STACK: traefik
		SERVICES_TO_CHECK: traefik_traefik
		IMAGE_TAG: latest
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		UI_AUTH: ${PRO_UI_AUTH}
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		UI_AUTH=${UI_AUTH}
		environment:
		name: pro/traefik
		url: https://traefik.${PRO_PUBLIC_HOSTNAME}
		only:
		- master
		when: manual

README.md

+9 −2

Original line number	Diff line number	Diff line
		@@ -10,6 +10,13 @@
		* Mail client
		* Mail server
		* Minio
		* PGAdmin
		* Portainer
		* Traefik

		### Problemas

		#### Correo en bucle
		Limpiar la cola de envio y purgar el buzón de entrada
		```
		postsuper -d ALL
		doveadm expunge -u email@redmic.es mailbox INBOX ALL
		```
		No newline at end of file

pgadmin/.env

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line
		PGADMIN_PORT=5050
		PGADMIN_SETUP_EMAIL=postgres
		PGADMIN_SETUP_PASSWORD=password
		MAIL_USER=postgres
		MAIL_PASSWORD=password

pgadmin/docker-compose.dev.yml

deleted100644 → 0

+0 −32

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

		services:
		pgadmin:
		ports:
		- target: ${PGADMIN_PORT}
		published: ${PGADMIN_PORT}
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${PGADMIN_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: Host:pgadmin.${PUBLIC_HOSTNAME}
		traefik.backend: pgadmin
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		delay: 30s
		window: 2m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 103M

		volumes:
		pgadmin-vol:
		name: pgadmin-vol

pgadmin/docker-compose.tmpl.yml

deleted100644 → 0

+0 −25

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

		services:
		pgadmin:
		image: chorss/docker-pgadmin4:${IMAGE_TAG:-latest}
		networks:
		- postgres-net
		- traefik-net
		volumes:
		- pgadmin-vol:/data
		environment:
		- SERVER_MODE=true
		- PGADMIN_SETUP_EMAIL
		- PGADMIN_SETUP_PASSWORD
		- MAIL_SERVER=mail.redmic.es
		- MAIL_PORT=25
		- MAIL_USE_TLS=true
		- MAIL_USER
		- MAIL_PASSWORD

		networks:
		postgres-net:
		external: true
		traefik-net:
		external: true