diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Makefile | 10 | ||||
| -rw-r--r-- | docker/compose/test-ydb-filer.yml (renamed from docker/compose/local-ydb-compose.yml) | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/docker/Makefile b/docker/Makefile index 1ace31933..c8603309d 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -7,7 +7,7 @@ gen: dev binary: export SWCOMMIT=$(shell git rev-parse --short HEAD) export SWLDFLAGS="-X github.com/chrislusf/seaweedfs/weed/util.COMMIT=$(SWCOMMIT)" - cd ../weed; CGO_ENABLED=0 GOOS=linux go build -ldflags "-extldflags -static $(SWLDFLAGS)"; mv weed ../docker/ + cd ../weed; CGO_ENABLED=0 GOOS=linux go build --tags "$(tags)" -ldflags "-extldflags -static $(SWLDFLAGS)"; mv weed ../docker/ build: binary docker build --no-cache -t chrislusf/seaweedfs:local -f Dockerfile.local . @@ -49,9 +49,6 @@ dev_replicate: build dev_auditlog: build docker-compose -f compose/local-auditlog-compose.yml -p seaweedfs up -dev_ydb: build - docker-compose -f compose/local-ydb-compose.yml -p seaweedfs up - cluster: build docker-compose -f compose/local-cluster-compose.yml -p seaweedfs up @@ -73,6 +70,11 @@ filer_etcd: build test_etcd: build docker-compose -f compose/test-etcd-filer.yml -p seaweedfs up +test_ydb: tags = ydb +test_ydb: build + export + docker-compose -f compose/test-ydb-filer.yml -p seaweedfs up + clean: rm ./weed diff --git a/docker/compose/local-ydb-compose.yml b/docker/compose/test-ydb-filer.yml index a17b77b8a..c0c31fe5b 100644 --- a/docker/compose/local-ydb-compose.yml +++ b/docker/compose/test-ydb-filer.yml @@ -17,8 +17,6 @@ services: ports: - 9333:9333 - 19333:19333 - - 8084:8080 - - 18084:18080 - 8888:8888 - 8000:8000 - 18888:18888 @@ -32,4 +30,6 @@ services: WEED_YDB_PREFIX: "seaweedfs" YDB_ANONYMOUS_CREDENTIALS: 1 WEED_MASTER_VOLUME_GROWTH_COPY_1: 1 - WEED_MASTER_VOLUME_GROWTH_COPY_OTHER: 1
\ No newline at end of file + WEED_MASTER_VOLUME_GROWTH_COPY_OTHER: 1 + depends_on: + - ydb
\ No newline at end of file |