Commit 9c423e1b authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/service-deployment!28
parents 0379d292 2c6dad1f

.gitlab-ci.yml

+0 −44
Original line number Diff line number Diff line
@@ -176,47 +176,3 @@ deploy-minio-dev: 
  only:

    - dev

  when: manual
 


deploy-portainer-dev:

  stage: deploy

  variables:

    DEPLOY_DIR_NAME: portainer

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: portainer

    SERVICES_TO_CHECK: portainer_agent portainer_portainer

    IMAGE_TAG: latest

    AGENT_IMAGE_TAG: latest

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    AGENT_DOCKER_VOLUMES_PATH: ${DEV_AGENT_DOCKER_VOLUMES_PATH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} AGENT_IMAGE_TAG=${AGENT_IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME} AGENT_DOCKER_VOLUMES_PATH=${AGENT_DOCKER_VOLUMES_PATH}

  environment:

    name: dev/portainer

    url: https://portainer.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

  when: manual



deploy-portainer-pro:

  stage: deploy

  variables:

    DEPLOY_DIR_NAME: portainer

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: portainer

    SERVICES_TO_CHECK: portainer_agent portainer_portainer

    IMAGE_TAG: latest

    AGENT_IMAGE_TAG: latest

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    AGENT_DOCKER_VOLUMES_PATH: ${PRO_AGENT_DOCKER_VOLUMES_PATH}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} AGENT_IMAGE_TAG=${AGENT_IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME} AGENT_DOCKER_VOLUMES_PATH=${AGENT_DOCKER_VOLUMES_PATH}

  environment:

    name: pro/portainer

    url: https://portainer.${PRO_PUBLIC_HOSTNAME}

  only:

    - master

  when: manual
 
 No newline at end of file

README.md

+1 −3
Original line number Diff line number Diff line
@@ -4,13 +4,11 @@ 


* Artifactory

* GitLab-CE

* GitLab Runner local

* GitLab Runner remote

* GitLab Runner

* Mail admin

* Mail client

* Mail server

* Minio

* Portainer



### Problemas

portainer/.env

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
AGENT_PORT=9001

LOG_LEVEL=error

portainer/docker-compose.dev.yml

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
version: '3.5'



volumes:

  portainer-vol:

    name: ${PORTAINER_VOL_NAME:-portainer-vol}

portainer/docker-compose.prod.yml

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
version: '3.5'



services:

  portainer:

    deploy:

      placement:

        constraints:

          - node.role == manager



volumes:

  portainer-vol:

    name: ${PORTAINER_VOL_NAME:-portainer-vol}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared