Commit e8db3490 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Omite condición de reinicio

See merge request redmic-project/service-deployment!18
parents 13bbe412 55ba73b1

artifactory/docker-compose.dev.yml

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ services: 
        traefik.frontend.rule: Host:artifactory.${PUBLIC_HOSTNAME}

        traefik.backend: artifactory

      restart_policy:

        condition: on-failure

        delay: 30s

        window: 2m

      resources:

gitlab-ce/docker-compose.dev.yml

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ services: 
        traefik.frontend.rule: Host:git.${PUBLIC_HOSTNAME}

        traefik.backend: gitlab

      restart_policy:

        condition: on-failure

        delay: 2m

        window: 5m

      resources:

gitlab-runner/docker-compose.gitlab-runner-local.dev.yml

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ services: 
      mode: replicated

      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 30s

        window: 1m

      resources:

gitlab-runner/docker-compose.gitlab-runner-remote.dev.yml

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ services: 
      mode: replicated

      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 30s

        window: 1m

      resources:

mail/mailserver/docker-compose.dev.yml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ services: 
        constraints:

          - node.role == manager

      restart_policy:

        condition: on-failure

        delay: 10s

        window: 1m

      resources: