diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-05-30 13:10:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-30 13:10:10 -0700 |
| commit | 730c9cf601c7a9a385857496f93c6537225edebc (patch) | |
| tree | b5c529dd26bec067c46b90ed6300e97e05c86e5f /docker | |
| parent | 625ee579fe32ac37c453d06e502d0d2c76ed52e7 (diff) | |
| parent | af562e1a208b973e187a60a20629d7bfde8809fb (diff) | |
| download | seaweedfs-730c9cf601c7a9a385857496f93c6537225edebc.tar.xz seaweedfs-730c9cf601c7a9a385857496f93c6537225edebc.zip | |
Merge pull request #3114 from kmlebedev/nextcloud
Create folders in s3 via nextcloud
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Makefile | 3 | ||||
| -rw-r--r-- | docker/compose/local-nextcloud-compose.yml | 44 | ||||
| -rw-r--r-- | docker/seaweedfs.sql | 2 |
3 files changed, 48 insertions, 1 deletions
diff --git a/docker/Makefile b/docker/Makefile index dbc82fde4..3afea17c1 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -52,6 +52,9 @@ dev_replicate: build dev_auditlog: build docker-compose -f compose/local-auditlog-compose.yml -p seaweedfs up +dev_nextcloud: build + docker-compose -f compose/local-nextcloud-compose.yml -p seaweedfs up + cluster: build docker-compose -f compose/local-cluster-compose.yml -p seaweedfs up diff --git a/docker/compose/local-nextcloud-compose.yml b/docker/compose/local-nextcloud-compose.yml new file mode 100644 index 000000000..80c3fca53 --- /dev/null +++ b/docker/compose/local-nextcloud-compose.yml @@ -0,0 +1,44 @@ +version: '2' + +services: + master: + image: chrislusf/seaweedfs:local + ports: + - 9333:9333 + - 19333:19333 + command: "master -ip=master" + volume: + image: chrislusf/seaweedfs:local + ports: + - 8080:8080 + - 18080:18080 + command: "volume -mserver=master:9333 -port=8080 -ip=volume" + depends_on: + - master + s3: + image: chrislusf/seaweedfs:local + ports: + - 8888:8888 + - 18888:18888 + - 8333:8333 + command: '-v 9 filer -master="master:9333" -s3' + depends_on: + - master + - volume + nextcloud: + image: nextcloud:23.0.5-apache + environment: + - OBJECTSTORE_S3_HOST=s3 + - OBJECTSTORE_S3_BUCKET=nextcloud + - OBJECTSTORE_S3_KEY=some_access_key1 + - OBJECTSTORE_S3_SECRET=some_secret_key1 + - OBJECTSTORE_S3_PORT=8333 + - OBJECTSTORE_S3_SSL=false + - OBJECTSTORE_S3_USEPATH_STYLE=true + - SQLITE_DATABASE=nextcloud + - NEXTCLOUD_ADMIN_USER=admin + - NEXTCLOUD_ADMIN_PASSWORD=admin + ports: + - 80:80 + depends_on: + - s3
\ No newline at end of file diff --git a/docker/seaweedfs.sql b/docker/seaweedfs.sql index 38ebc575c..a27eb7081 100644 --- a/docker/seaweedfs.sql +++ b/docker/seaweedfs.sql @@ -1,6 +1,6 @@ CREATE DATABASE IF NOT EXISTS seaweedfs; CREATE USER IF NOT EXISTS 'seaweedfs'@'%' IDENTIFIED BY 'secret'; -GRANT ALL PRIVILEGES ON seaweedfs_fast.* TO 'seaweedfs'@'%'; +GRANT ALL PRIVILEGES ON seaweedfs.* TO 'seaweedfs'@'%'; FLUSH PRIVILEGES; USE seaweedfs; CREATE TABLE IF NOT EXISTS filemeta ( |