Commit 5faf5714 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Limpia y actualiza detalles

See merge request redmic-project/maintenance/portainer!6
parents d6cbb12a e787d15b

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -9,5 +9,3 @@ stages: 
.deploy:

  variables:

    STACK: maintenance
 
  environment:

    url: https://${CI_PROJECT_NAME}.${PUBLIC_HOSTNAME}

deploy/.env

+3 −2
Original line number Diff line number Diff line 
AGENT_PORT=9001

LOG_LEVEL=error

LOG_LEVEL=ERROR

PORTAINER_CE_PORT=9000

PORTAINER_CE_DATA_VOL_NAME=portainer-vol
 


DATA_VOL_NAME=portainer-vol

deploy/docker-compose.dev.yml

+5 −5
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



volumes:

  data-vol:

    name: ${PORTAINER_CE_DATA_VOL_NAME}

    name: ${DATA_VOL_NAME}

    driver: local

    driver_opts:

      type: ${PORTAINER_CE_DATA_VOL_TYPE:-nfs4}

      o: addr=${PORTAINER_CE_DATA_VOL_ADDR:-127.0.0.1},${PORTAINER_CE_DATA_VOL_OPTIONS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      device: ${PORTAINER_CE_DATA_VOL_DEVICE:-:/portainer-vol/}
 
      type: ${VOL_TYPE:-nfs4}

      o: addr=${VOL_ADDR:-127.0.0.1},${VOL_OPTS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      device: ${DATA_VOL_DEVICE:-:/portainer-vol/}

deploy/docker-compose.prod.yml

+2 −2
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  portainer-ce:
@@ -9,7 +9,7 @@ services: 


volumes:

  data-vol:

    name: ${PORTAINER_CE_DATA_VOL_NAME}

    name: ${DATA_VOL_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: shared

deploy/docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  portainer-agent:

README.md

+1 −1

File changed.

Contains only whitespace changes.