diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile index 669980ee2d9..226d27a9e6b 100644 --- a/docker/test/stateless/Dockerfile +++ b/docker/test/stateless/Dockerfile @@ -51,10 +51,10 @@ ENV MAX_RUN_TIME=0 # Download Minio-related binaries -RUN wget 'https://dl.min.io/server/minio/release/linux-amd64/minio' \ - && chmod +x minio \ - && wget 'https://dl.min.io/client/mc/release/linux-amd64/mc' \ - && chmod +x ./mc +RUN wget 'https://dl.min.io/server/minio/release/linux-amd64/minio' -o /minio \ + && chmod +x /minio \ + && wget 'https://dl.min.io/client/mc/release/linux-amd64/mc' -o /minio \ + && chmod +x /mc ENV MINIO_ROOT_USER=clickhouse ENV MINIO_ROOT_PASSWORD=clickhouse diff --git a/docker/test/stateless/setup_minio.sh b/docker/test/stateless/setup_minio.sh index 33c6de18e7c..06b434c0a96 100755 --- a/docker/test/stateless/setup_minio.sh +++ b/docker/test/stateless/setup_minio.sh @@ -2,18 +2,12 @@ set -e -x -a +/minio server --address ":11111" ./data > /dev/null & - - -./minio server --address ":11111" ./data > /dev/null & - - - - -./mc alias set clickminio http://localhost:11111 clickhouse clickhouse -./mc admin user add clickminio test testtest -./mc admin policy set clickminio readwrite user=test -./mc mb clickminio/test +/mc alias set clickminio http://localhost:11111 clickhouse clickhouse +/mc admin user add clickminio test testtest +/mc admin policy set clickminio readwrite user=test +/mc mb clickminio/test # Upload data to Minio. By default after unpacking all tests will in @@ -24,5 +18,5 @@ cd /usr/share/clickhouse-test/queries/0_stateless/test_minio FILES=$(ls .) for FILE in $FILES; do echo $FILE; - ./mc cp $FILE clickminio/test/$FILE; + /mc cp $FILE clickminio/test/$FILE; done