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

Jump to bottom

Switch e2e test docker-compose to docker compose #3816

Closed
wants to merge 3 commits into from
Closed

Switch e2e test docker-compose to docker compose #3816

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1b0bd2
Switch e2e test `docker-compose` to `docker compose`
steiza Aug 5, 2024
014eb30
Try --compatibility
steiza Aug 5, 2024
70d2860
Try labeling network
steiza Aug 5, 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: 4 additions & 4 deletions test/e2e_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -ex
echo "setting up OIDC provider"
pushd ./test/fakeoidc
oidcimg=$(ko build main.go --local)
docker network ls | grep fulcio_default || docker network create fulcio_default
docker network ls | grep fulcio_default || docker network create --label com.docker.compose.network=fulcio_default fulcio_default
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works for me if I have

Suggested change
docker network ls | grep fulcio_default || docker network create --label com.docker.compose.network=fulcio_default fulcio_default
docker network ls | grep fulcio_default || docker network create --label com.docker.compose.network=default fulcio_default

docker run -d --rm -p 8080:8080 --network fulcio_default --name fakeoidc $oidcimg
cleanup_oidc() {
echo "cleaning up oidc"
Expand Down Expand Up @@ -59,10 +59,10 @@ export FULCIO_METRICS_PORT=2113
export FULCIO_CONFIG=/tmp/fulcio-config.json
for repo in rekor fulcio; do
pushd $repo
docker-compose up -d
docker compose up -d
echo -n "waiting up to 60 sec for system to start"
count=0
until [ $(docker-compose ps | grep -c "(healthy)") == 3 ];
until [ $(docker compose ps | grep -c "(healthy)") == 3 ];
do
if [ $count -eq 6 ]; then
echo "! timeout reached"
Expand All @@ -80,7 +80,7 @@ cleanup_services() {
cleanup_oidc
for repo in rekor fulcio; do
pushd $HOME/$repo
docker-compose down
docker compose down
popd
done
}
Expand Down
Loading