diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62653ee..929f711 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,6 @@ deploy: stage: deploy rules: - if: '$CI_COMMIT_REF_NAME == "master"' - when: manual variables: SSH_HOST: "158.160.172.23" SSH_USER: "ubuntu" diff --git a/compose.yaml b/compose.yaml index 53771a3..09ab21e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -410,7 +410,7 @@ services: test: ["CMD", "service", "nginx", "status", "||", " exit 1"] interval: 1m30s timeout: 5s - start_period: 5s + start_period: 15s start_interval: 2s retries: 5 ports: