Skip to content

Commit

Permalink
fix actions-services.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
briskt committed May 14, 2024
1 parent d2d0837 commit 2aafb06
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
14 changes: 10 additions & 4 deletions actions-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ services:
- pwmanager.local
- test-browser
environment:
- MYSQL_HOST=db
- MYSQL_DATABASE=silauth
- MYSQL_USER=silauth
- MYSQL_PASSWORD=silauth
- PROFILE_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub
- [email protected]
- ADMIN_PASS=b
- SECRET_SALT=abc123
- IDP_NAME=x
- MYSQL_HOST=db
- MYSQL_DATABASE=silauth
- MYSQL_USER=silauth
- MYSQL_PASSWORD=silauth
volumes:
- ./dockerbuild/run-integration-tests.sh:/data/run-integration-tests.sh
- ./dockerbuild/run-metadata-tests.sh:/data/run-metadata-tests.sh
Expand Down Expand Up @@ -74,6 +74,8 @@ services:

ssp-idp1.local:
build: .
depends_on:
- db
volumes:
# Utilize custom certs
- ./development/idp-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
Expand Down Expand Up @@ -118,6 +120,10 @@ services:
SECURE_COOKIE: "false"
SHOW_SAML_ERRORS: "true"
THEME_USE: "default"
MYSQL_HOST: "db"
MYSQL_DATABASE: "silauth"
MYSQL_USER: "silauth"
MYSQL_PASSWORD: "silauth"
BASE_URL_PATH: "http://ssp-idp1.local/"

ssp-idp2.local:
Expand Down
4 changes: 2 additions & 2 deletions dockerbuild/run-integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ cd /data
export COMPOSER_ALLOW_SUPERUSER=1; composer install

whenavail "ssp-hub.local" 80 15 echo Hub ready
whenavail "ssp-idp1.local" 80 15 echo IDP 1 ready
whenavail "ssp-sp1.local" 80 15 echo SP 1 ready
whenavail "ssp-idp1.local" 80 5 echo IDP 1 ready
whenavail "ssp-sp1.local" 80 5 echo SP 1 ready

./vendor/bin/behat \
--no-interaction \
Expand Down

0 comments on commit 2aafb06

Please sign in to comment.