gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

refactor(compose)!: upgrade to v2 closes #3699 (#3705)

Browse source 
* docs(compose): Update readme for compose v2 upgrade

Signed-off-by: Ryan Russell <git@ryanrussell.org>

* refactor(compose): Upgrade `Makefile` for compose v2

Signed-off-by: Ryan Russell <git@ryanrussell.org>

* refactor(compose): Upgrade yml from version 2 -> 3.9

Signed-off-by: Ryan Russell <git@ryanrussell.org>

Signed-off-by: Ryan Russell <git@ryanrussell.org>
This commit is contained in:
Ryan Russell 2022-10-16 16:02:33 -05:00 committed by GitHub
parent e20f0dbd2d
commit 949607fe90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 46 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
docker/Makefile
View file

@ -39,63 +39,63 @@ s3tests_build:
docker build --no-cache -t chrislusf/ceph-s3-tests:local -f Dockerfile.s3tests . docker build --no-cache -t chrislusf/ceph-s3-tests:local -f Dockerfile.s3tests .
dev: build dev: build
docker-compose -f compose/local-dev-compose.yml -p seaweedfs up docker compose -f compose/local-dev-compose.yml -p seaweedfs up
dev_race: binary_race dev_race: binary_race
docker-compose -f compose/local-dev-compose.yml -p seaweedfs up docker compose -f compose/local-dev-compose.yml -p seaweedfs up
dev_tls: build certstrap dev_tls: build certstrap
ENV_FILE="tls.env" docker-compose -f compose/local-dev-compose.yml -p seaweedfs up ENV_FILE="tls.env" docker compose -f compose/local-dev-compose.yml -p seaweedfs up
dev_mount: build dev_mount: build
docker-compose -f compose/local-mount-compose.yml -p seaweedfs up docker compose -f compose/local-mount-compose.yml -p seaweedfs up
run_image: build run_image: build
docker run --rm -ti --device /dev/fuse --cap-add SYS_ADMIN --entrypoint /bin/sh chrislusf/seaweedfs:local docker run --rm -ti --device /dev/fuse --cap-add SYS_ADMIN --entrypoint /bin/sh chrislusf/seaweedfs:local
profile_mount: build profile_mount: build
docker-compose -f compose/local-mount-profile-compose.yml -p seaweedfs up docker compose -f compose/local-mount-profile-compose.yml -p seaweedfs up
k8s: build k8s: build
docker-compose -f compose/local-k8s-compose.yml -p seaweedfs up docker compose -f compose/local-k8s-compose.yml -p seaweedfs up
dev_registry: build dev_registry: build
docker-compose -f compose/local-registry-compose.yml -p seaweedfs up docker compose -f compose/local-registry-compose.yml -p seaweedfs up
dev_replicate: build dev_replicate: build
docker-compose -f compose/local-replicate-compose.yml -p seaweedfs up docker compose -f compose/local-replicate-compose.yml -p seaweedfs up
dev_auditlog: build dev_auditlog: build
docker-compose -f compose/local-auditlog-compose.yml -p seaweedfs up docker compose -f compose/local-auditlog-compose.yml -p seaweedfs up
dev_nextcloud: build dev_nextcloud: build
docker-compose -f compose/local-nextcloud-compose.yml -p seaweedfs up docker compose -f compose/local-nextcloud-compose.yml -p seaweedfs up
cluster: build cluster: build
docker-compose -f compose/local-cluster-compose.yml -p seaweedfs up docker compose -f compose/local-cluster-compose.yml -p seaweedfs up
2clusters: build 2clusters: build
docker-compose -f compose/local-clusters-compose.yml -p seaweedfs up docker compose -f compose/local-clusters-compose.yml -p seaweedfs up
2mount: build 2mount: build
docker-compose -f compose/local-sync-mount-compose.yml -p seaweedfs up docker compose -f compose/local-sync-mount-compose.yml -p seaweedfs up
hashicorp_raft: build hashicorp_raft: build
docker-compose -f compose/local-hashicorp-raft-compose.yml -p seaweedfs up docker compose -f compose/local-hashicorp-raft-compose.yml -p seaweedfs up
s3tests: build s3tests_build s3tests: build s3tests_build
docker-compose -f compose/local-s3tests-compose.yml -p seaweedfs up docker compose -f compose/local-s3tests-compose.yml -p seaweedfs up
filer_etcd: build filer_etcd: build
docker stack deploy -c compose/swarm-etcd.yml fs docker stack deploy -c compose/swarm-etcd.yml fs
test_etcd: build test_etcd: build
docker-compose -f compose/test-etcd-filer.yml -p seaweedfs up docker compose -f compose/test-etcd-filer.yml -p seaweedfs up
test_ydb: tags = ydb test_ydb: tags = ydb
test_ydb: build test_ydb: build
export export
docker-compose -f compose/test-ydb-filer.yml -p seaweedfs up docker compose -f compose/test-ydb-filer.yml -p seaweedfs up
clean: clean:
rm ./weed rm ./weed

14
docker/README.md
View file

@ -1,5 +1,15 @@
# Docker # Docker
## Compose V2
SeaweedFS now uses the `v2` syntax `docker compose`
If you rely on using Docker Compose as docker-compose (with a hyphen), you can set up Compose V2 to act as a drop-in replacement of the previous docker-compose. Refer to the [Installing Compose](https://docs.docker.com/compose/install/) section for detailed instructions on upgrading.
Confirm your system has docker compose v2 with a version check
```bash
$ docker compose version
Docker Compose version v2.10.2
```
## Try it out ## Try it out
@ -7,7 +17,7 @@
wget https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/docker/seaweedfs-compose.yml wget https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/docker/seaweedfs-compose.yml
docker-compose -f seaweedfs-compose.yml -p seaweedfs up docker compose -f seaweedfs-compose.yml -p seaweedfs up
``` ```
@ -17,7 +27,7 @@ docker-compose -f seaweedfs-compose.yml -p seaweedfs up
wget https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/docker/seaweedfs-dev-compose.yml wget https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/docker/seaweedfs-dev-compose.yml
docker-compose -f seaweedfs-dev-compose.yml -p seaweedfs up docker compose -f seaweedfs-dev-compose.yml -p seaweedfs up
``` ```

2
docker/compose/local-auditlog-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
s3: s3:

2
docker/compose/local-cluster-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master0: master0:

2
docker/compose/local-clusters-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
server1: server1:

2
docker/compose/local-dev-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/local-hashicorp-raft-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master0: master0:

2
docker/compose/local-k8s-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/local-minio-gateway-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/local-mount-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/local-mount-profile-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/local-nextcloud-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/local-registry-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/local-replicate-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/local-s3tests-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/compose/test-etcd-filer.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
etcd: etcd:

2
docker/compose/test-ydb-filer.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
ydb: ydb:

2
docker/seaweedfs-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master:

2
docker/seaweedfs-dev-compose.yml
View file

@ -1,4 +1,4 @@
version: '2' version: '3.9'
services: services:
master: master: