Commit 3ec703d2 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Adapta CI a nueva versión de plantillas

See merge request redmic-project/portainer!3
parents 7c6f9045 4aeeed42

.gitlab-ci.yml

+0 −5
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ include: 
stages:

  - deploy



variables:

  STACK: ${CI_PROJECT_NAME}

  DD_AGENT_IMAGE_NAME: portainer/agent

  DD_PORTAINER_IMAGE_NAME: portainer/portainer



.deploy:

  variables:

    SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_agent ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}

deploy/docker-compose.dev.yml

+7 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  portainer:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}



volumes:

  portainer-vol:

    name: ${PORTAINER_VOL_NAME}

deploy/docker-compose.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -66,4 +66,5 @@ networks: 


  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true