aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2023-09-25 09:16:35 -0700
committerchrislu <chris.lu@gmail.com>2023-09-25 09:16:35 -0700
commit3d07895518b2b6e816518be0a2355c1f0a98ff15 (patch)
treef06fda180691efb0b58c9ac0e82988e1cea31e14 /docker
parenta6e35e4f685b7713cb863d3f28c85a4b8ae89ab8 (diff)
parenta132d445568f4de6dba617b83b42d9b9cfb1cbd2 (diff)
downloadseaweedfs-3d07895518b2b6e816518be0a2355c1f0a98ff15.tar.xz
seaweedfs-3d07895518b2b6e816518be0a2355c1f0a98ff15.zip
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'docker')
-rw-r--r--docker/compose/s3.json14
-rw-r--r--docker/compose/s3tests.conf4
2 files changed, 14 insertions, 4 deletions
diff --git a/docker/compose/s3.json b/docker/compose/s3.json
index 64dedb681..ce230863b 100644
--- a/docker/compose/s3.json
+++ b/docker/compose/s3.json
@@ -40,7 +40,10 @@
"List",
"Tagging",
"Write"
- ]
+ ],
+ "account": {
+ "id": "testid"
+ }
},
{
"name": "s3_tests_alt",
@@ -101,5 +104,12 @@
"Write"
]
}
- ]
+ ],
+ "accounts": [
+ {
+ "id" : "testid",
+ "displayName": "M. Tester",
+ "emailAddress": "tester@ceph.com"
+ }
+ ]
} \ No newline at end of file
diff --git a/docker/compose/s3tests.conf b/docker/compose/s3tests.conf
index 2bffe20d4..68d9ddeb7 100644
--- a/docker/compose/s3tests.conf
+++ b/docker/compose/s3tests.conf
@@ -18,10 +18,10 @@ bucket prefix = yournamehere-{random}-
[s3 main]
# main display_name set in vstart.sh
-display_name = s3_tests
+display_name = M. Tester
# main user_idname set in vstart.sh
-user_id = s3_tests
+user_id = testid
# main email set in vstart.sh
email = tester@ceph.com