summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2023-10-22 10:35:35 +0300
committerAndrew Dolgov <[email protected]>2023-10-22 10:35:35 +0300
commit322296d6a0b18577ad6678fedb74743de186ed2f (patch)
tree79c5b8b946028573a7fa1d43819c92e7d5d1614d
parentccb4a4d337dec37464dc91ab4be991da17c0db0d (diff)
fix local compose file typo, wait a bit before curling login page
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--docker-compose.yml2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85cc67d6c..57c285b6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,6 +64,7 @@ integration-test:
TEST_HELM_REPO: https://gitlab.tt-rss.org/tt-rss/helm-charts/tt-rss
extends: .integration-test
script:
+ - sleep 5
- curl -fs http://tt-rss-${CI_COMMIT_SHORT_SHA}-app/tt-rss/index.php | grep -q Login
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
diff --git a/docker-compose.yml b/docker-compose.yml
index 2925068e3..365ca9f49 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
env_file:
- .env
volumes:
- - .:/var/www/html
+ - .:/var/www/html/tt-rss
depends_on:
- app
command: /opt/tt-rss/updater.sh