Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve local development #299

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Improve local development #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b0fa41
Specify `platform` for non-cross-platform docker images (for local dev)
forevermatt Dec 2, 2024
88816f3
Increase timeout when tests are waiting for local IDP to start up
forevermatt Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ services:

test-browser:
image: justinribeiro/chrome-headless:stable
platform: linux/amd64
ports:
- "9222:9222"
cap_add:
Expand Down Expand Up @@ -258,6 +259,7 @@ services:

ssp-sp1.local:
image: silintl/ssp-base:9.3.0
platform: linux/amd64
volumes:
# Utilize custom certs
- ./development/sp-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
Expand All @@ -284,6 +286,7 @@ services:

ssp-sp2.local:
image: silintl/ssp-base:9.3.0
platform: linux/amd64
volumes:
# Utilize custom certs
- ./development/sp2-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
Expand All @@ -307,6 +310,7 @@ services:

ssp-sp3.local:
image: silintl/ssp-base:9.3.0
platform: linux/amd64
volumes:
# Utilize custom certs
- ./development/sp3-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
Expand All @@ -332,6 +336,7 @@ services:

pwmanager.local:
image: silintl/ssp-base:9.3.0
platform: linux/amd64
volumes:
# Utilize custom certs
- ./development/sp-local/cert:/data/vendor/simplesamlphp/simplesamlphp/cert
Expand All @@ -354,6 +359,7 @@ services:
# the broker and brokerDb containers are used by the silauth module
broker:
image: silintl/idp-id-broker:latest
platform: linux/amd64
ports:
- "80"
depends_on:
Expand Down Expand Up @@ -413,6 +419,7 @@ services:

dynamo:
image: cnadiminti/dynamodb-local
platform: linux/amd64
command: "-sharedDb -inMemory"
hostname: dynamo
ports:
Expand All @@ -422,6 +429,7 @@ services:

init-dynamo:
image: garland/aws-cli-docker
platform: linux/amd64
command: "/init-dynamodb.sh"
volumes:
- ./development/init-dynamodb.sh:/init-dynamodb.sh
Expand Down
2 changes: 1 addition & 1 deletion dockerbuild/run-integration-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e
cd /data

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

./vendor/bin/behat \
Expand Down
Loading