Compare commits

..

2 Commits

Author SHA1 Message Date
dependabot[bot]
af9eff3427 Bump golang.org/x/sync from 0.18.0 to 0.19.0
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.18.0 to 0.19.0.
- [Commits](https://github.com/golang/sync/compare/v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-version: 0.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-09 09:23:38 +00:00
Frederik Ring
9213a4db55 Prevent Docker Hub login when secrets are not available (#694) 2025-12-09 10:17:44 +01:00
5 changed files with 10 additions and 24 deletions

View File

@@ -14,6 +14,7 @@ jobs:
- name: Log in to Docker Hub
uses: docker/login-action@v2
continue-on-error: true
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

2
go.mod
View File

@@ -23,7 +23,7 @@ require (
github.com/studio-b12/gowebdav v0.11.0
golang.org/x/crypto v0.45.0
golang.org/x/oauth2 v0.33.0
golang.org/x/sync v0.18.0
golang.org/x/sync v0.19.0
google.golang.org/api v0.256.0
mvdan.cc/sh/v3 v3.12.0
)

4
go.sum
View File

@@ -497,8 +497,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

View File

@@ -10,15 +10,6 @@ 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
@@ -28,7 +19,7 @@ services:
environment:
AWS_ACCESS_KEY_ID: test
AWS_SECRET_ACCESS_KEY: GMusLtUmILge2by+z890kQ
AWS_ENDPOINT: rustfs:9000
AWS_ENDPOINT: minio:9000
AWS_ENDPOINT_PROTO: http
AWS_S3_BUCKET_NAME: backup
BACKUP_FILENAME_EXPAND: 'true'
@@ -52,5 +43,3 @@ volumes:
minio_backup_data:
name: minio_backup_data
app_data:
rustfs_backup_data:
name: rustfs_backup_data

View File

@@ -13,14 +13,10 @@ docker compose exec backup backup
sleep 5
# expect_running_containers "3"
expect_running_containers "3"
docker run --rm \
-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 \
-v minio_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'
@@ -34,7 +30,7 @@ sleep 5
docker compose exec backup backup
docker run --rm \
-v rustfs_backup_data:/minio_data \
-v minio_backup_data:/minio_data \
alpine \
ash -c '[ $(find /minio_data/backup/ -type f | wc -l) = "1" ]'
@@ -50,7 +46,7 @@ info "Create first backup with no prune"
docker compose exec backup backup
docker run --rm \
-v rustfs_backup_data:/minio_data \
-v minio_backup_data:/minio_data \
alpine \
ash -c 'touch -d@$(( $(date +%s) - 1209600 )) /minio_data/backup/test-hostnametoken-old.tar.gz'
@@ -58,7 +54,7 @@ info "Create second backup and prune"
docker compose exec backup backup
docker run --rm \
-v rustfs_backup_data:/minio_data \
-v minio_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'