valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix local compose file typo, wait a bit before curling login page

This commit is contained in:
Andrew Dolgov 2023-10-22 10:35:35 +03:00
parent ccb4a4d337
commit 322296d6a0
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -64,6 +64,7 @@ integration-test:
TEST_HELM_REPO: https://gitlab.tt-rss.org/tt-rss/helm-charts/tt-rss TEST_HELM_REPO: https://gitlab.tt-rss.org/tt-rss/helm-charts/tt-rss
extends: .integration-test extends: .integration-test
script: script:
- sleep 5
- curl -fs http://tt-rss-${CI_COMMIT_SHORT_SHA}-app/tt-rss/index.php | grep -q Login - curl -fs http://tt-rss-${CI_COMMIT_SHORT_SHA}-app/tt-rss/index.php | grep -q Login
rules: rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

2
docker-compose.yml
View File

@ -34,7 +34,7 @@ services:
env_file: env_file:
- .env - .env
volumes: volumes:
- .:/var/www/html - .:/var/www/html/tt-rss
depends_on: depends_on:
- app - app
command: /opt/tt-rss/updater.sh command: /opt/tt-rss/updater.sh