diff --git a/test/s3/docker-compose.yml b/test/s3/docker-compose.yml index af0d7ec..e206af0 100644 --- a/test/s3/docker-compose.yml +++ b/test/s3/docker-compose.yml @@ -10,6 +10,15 @@ services: volumes: - minio_backup_data:/data + rustfs: + image: rustfs/rustfs:1.0.0-alpha.71 + volumes: + - rustfs_backup_data:/data + environment: + RUSTFS_ACCESS_KEY: test + RUSTFS_SECRET_KEY: GMusLtUmILge2by+z890kQ + entrypoint: /bin/ash -c 'mkdir -p /data/backup && /entrypoint.sh' + backup: image: offen/docker-volume-backup:${TEST_VERSION:-canary} hostname: hostnametoken @@ -19,7 +28,7 @@ services: environment: AWS_ACCESS_KEY_ID: test AWS_SECRET_ACCESS_KEY: GMusLtUmILge2by+z890kQ - AWS_ENDPOINT: minio:9000 + AWS_ENDPOINT: rustfs:9000 AWS_ENDPOINT_PROTO: http AWS_S3_BUCKET_NAME: backup BACKUP_FILENAME_EXPAND: 'true' @@ -43,3 +52,5 @@ volumes: minio_backup_data: name: minio_backup_data app_data: + rustfs_backup_data: + name: rustfs_backup_data diff --git a/test/s3/run.sh b/test/s3/run.sh index 4fc5ecd..cbb15ec 100755 --- a/test/s3/run.sh +++ b/test/s3/run.sh @@ -13,10 +13,14 @@ docker compose exec backup backup sleep 5 -expect_running_containers "3" +# expect_running_containers "3" docker run --rm \ - -v minio_backup_data:/minio_data \ + -v rustfs_backup_data:/minio_data \ + alpine \ + ash -c 'ls -lah /minio_data && ls -lah /minio_data/backup' +docker run --rm \ + -v rustfs_backup_data:/minio_data \ alpine \ ash -c 'tar -xvf /minio_data/backup/test-hostnametoken.tar.gz -C /tmp && test -f /tmp/backup/app_data/offen.db' @@ -30,7 +34,7 @@ sleep 5 docker compose exec backup backup docker run --rm \ - -v minio_backup_data:/minio_data \ + -v rustfs_backup_data:/minio_data \ alpine \ ash -c '[ $(find /minio_data/backup/ -type f | wc -l) = "1" ]' @@ -46,7 +50,7 @@ info "Create first backup with no prune" docker compose exec backup backup docker run --rm \ - -v minio_backup_data:/minio_data \ + -v rustfs_backup_data:/minio_data \ alpine \ ash -c 'touch -d@$(( $(date +%s) - 1209600 )) /minio_data/backup/test-hostnametoken-old.tar.gz' @@ -54,7 +58,7 @@ info "Create second backup and prune" docker compose exec backup backup docker run --rm \ - -v minio_backup_data:/minio_data \ + -v rustfs_backup_data:/minio_data \ alpine \ ash -c 'test ! -f /minio_data/backup/test-hostnametoken-old.tar.gz && test -f /minio_data/backup/test-hostnametoken.tar.gz'