diff --git a/.github/workflows/run-s3-test-push.yml b/.github/workflows/run-s3-test-push.yml index a3c8879f..9564134b 100644 --- a/.github/workflows/run-s3-test-push.yml +++ b/.github/workflows/run-s3-test-push.yml @@ -29,7 +29,7 @@ jobs: run: tests/s3_exploratory/minio_scripts/minio-start - name: Wait for minio object storage to start run: | - until curl -if http://localhost:9001; do + until curl -s http://localhost:9000 >/dev/null; do sleep 1; done - name: Run Reductionist container diff --git a/.github/workflows/test_s3_minio.yml b/.github/workflows/test_s3_minio.yml index 304c3268..bf3999da 100644 --- a/.github/workflows/test_s3_minio.yml +++ b/.github/workflows/test_s3_minio.yml @@ -33,7 +33,7 @@ jobs: run: tests/s3_exploratory/minio_scripts/minio-start - name: Wait for minio object storage to start run: | - until curl -if http://localhost:9001; do + until curl -s http://localhost:9000 >/dev/null; do sleep 1; done - name: Run Reductionist container diff --git a/tests/s3_exploratory/minio_scripts/minio-start b/tests/s3_exploratory/minio_scripts/minio-start index 823b9896..232b5749 100755 --- a/tests/s3_exploratory/minio_scripts/minio-start +++ b/tests/s3_exploratory/minio_scripts/minio-start @@ -1,4 +1,10 @@ #!/usr/bin/env bash # Use timestamped storage volume so that test data is removed when container is stopped -exec docker run --detach --rm -p 9000:9000 -p 9001:9001 -v minio_$(date +%s) --name minio quay.io/minio/minio server data --console-address ":9001" +exec docker run --detach --rm \ + -p 9000:8333 \ + --name seaweedfs \ + -e AWS_ACCESS_KEY_ID=minioadmin \ + -e AWS_SECRET_ACCESS_KEY=minioadmin \ + -e S3_BUCKET=pyactivestorage \ + chrislusf/seaweedfs diff --git a/tests/s3_exploratory/minio_scripts/minio-stop b/tests/s3_exploratory/minio_scripts/minio-stop index 663b8b4e..4da056b1 100755 --- a/tests/s3_exploratory/minio_scripts/minio-stop +++ b/tests/s3_exploratory/minio_scripts/minio-stop @@ -1,3 +1,3 @@ #!/usr/bin/env bash -exec docker stop minio +exec docker stop seaweedfs