Compare commits

...

3 Commits

Author SHA1 Message Date
Frederik Ring
fb551c53c7 Try using RustFS instead of MinIO server in tests 2025-12-04 15:29:44 +01:00
Frederik Ring
4d87150f3b containerd storage cannot be shared across containers 2025-12-02 17:17:54 +01:00
Frederik Ring
89e0ebfe32 Default image store location has changed in Docker 29 2025-12-02 16:25:24 +01:00
3 changed files with 37 additions and 8 deletions

View File

@@ -13,19 +13,33 @@ services:
- ${HOME}/.docker/config.json:/root/.docker/config.json
- ${TARBALL:-.}:/cache/image.tar.gz
- docker_volume_backup_test_sandbox_image:/var/lib/docker/image
- docker_volume_backup_test_sandbox_overlay2:/var/lib/docker/overlay2
- docker_volume_backup_test_sandbox_containerd:/var/lib/docker/containerd
worker1:
<<: *node
hostname: worker1
volumes:
- ./:/code
- ${HOME}/.docker/config.json:/root/.docker/config.json
- ${TARBALL:-.}:/cache/image.tar.gz
- docker_volume_backup_test_sandbox_image:/var/lib/docker/image
- docker_volume_backup_test_sandbox_containerd_1:/var/lib/docker/containerd
profiles:
- multinode
worker2:
<<: *node
hostname: worker2
volumes:
- ./:/code
- ${HOME}/.docker/config.json:/root/.docker/config.json
- ${TARBALL:-.}:/cache/image.tar.gz
- docker_volume_backup_test_sandbox_image:/var/lib/docker/image
- docker_volume_backup_test_sandbox_containerd_2:/var/lib/docker/containerd
profiles:
- multinode
volumes:
docker_volume_backup_test_sandbox_image:
docker_volume_backup_test_sandbox_overlay2:
docker_volume_backup_test_sandbox_containerd:
docker_volume_backup_test_sandbox_containerd_1:
docker_volume_backup_test_sandbox_containerd_2:

View File

@@ -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

View File

@@ -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'