docker-compose: Delete deprecated file
Delete the docker-compose file which was sitting in the root of the repository because we don't use it anymore. Remove the Makefile targets which were call docker-compose and referencing the file. Change-Id: I6060fc7f06cd4b612ecb5d13ff80d67cfbc4e438
This commit is contained in:
parent
613a95530b
commit
5642a7a8dc
12
Makefile
12
Makefile
@ -117,11 +117,6 @@ test-certificates: ## Test certificate signing service and storagenode setup (je
|
|||||||
@echo "Running ${@}"
|
@echo "Running ${@}"
|
||||||
@./scripts/test-certificates.sh
|
@./scripts/test-certificates.sh
|
||||||
|
|
||||||
.PHONY: test-docker
|
|
||||||
test-docker: ## Run tests in Docker
|
|
||||||
docker-compose up -d --remove-orphans test
|
|
||||||
docker-compose run test make test
|
|
||||||
|
|
||||||
.PHONY: test-sim-backwards-compatible
|
.PHONY: test-sim-backwards-compatible
|
||||||
test-sim-backwards-compatible: ## Test uploading a file with lastest release (jenkins)
|
test-sim-backwards-compatible: ## Test uploading a file with lastest release (jenkins)
|
||||||
@echo "Running ${@}"
|
@echo "Running ${@}"
|
||||||
@ -337,7 +332,7 @@ binaries-upload: ## Upload binaries to Google Storage (jenkins)
|
|||||||
##@ Clean
|
##@ Clean
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean: test-docker-clean binaries-clean clean-images ## Clean docker test environment, local release binaries, and local Docker images
|
clean: binaries-clean clean-images ## Clean docker test environment, local release binaries, and local Docker images
|
||||||
|
|
||||||
.PHONY: binaries-clean
|
.PHONY: binaries-clean
|
||||||
binaries-clean: ## Remove all local release binaries (jenkins)
|
binaries-clean: ## Remove all local release binaries (jenkins)
|
||||||
@ -350,11 +345,6 @@ clean-images:
|
|||||||
-docker rmi storjlabs/uplink:${TAG}${CUSTOMTAG}
|
-docker rmi storjlabs/uplink:${TAG}${CUSTOMTAG}
|
||||||
-docker rmi storjlabs/versioncontrol:${TAG}${CUSTOMTAG}
|
-docker rmi storjlabs/versioncontrol:${TAG}${CUSTOMTAG}
|
||||||
|
|
||||||
.PHONY: test-docker-clean
|
|
||||||
test-docker-clean: ## Clean up Docker environment used in test-docker target
|
|
||||||
-docker-compose down --rmi all
|
|
||||||
|
|
||||||
|
|
||||||
##@ Tooling
|
##@ Tooling
|
||||||
|
|
||||||
.PHONY: diagrams
|
.PHONY: diagrams
|
||||||
|
@ -1,64 +0,0 @@
|
|||||||
version: '3'
|
|
||||||
services:
|
|
||||||
test-redis:
|
|
||||||
image: redis
|
|
||||||
test-postgres:
|
|
||||||
image: postgres
|
|
||||||
ports:
|
|
||||||
- 5432:5432
|
|
||||||
environment:
|
|
||||||
- POSTGRES_USER=storj
|
|
||||||
- POSTGRES_PASSWORD=storj-pass
|
|
||||||
- POSTGRES_DB=teststorj
|
|
||||||
|
|
||||||
satellite:
|
|
||||||
image: storjlabs/satellite:${VERSION:-latest}
|
|
||||||
environment:
|
|
||||||
- API_KEY=abc123
|
|
||||||
- STORJ_CHECKER_QUEUE_ADDRESS=redis://redis:6379/?db=0
|
|
||||||
- STORJ_DATABASE=postgres://postgres:postgres@postgres/satellite?sslmode=disable
|
|
||||||
- STORJ_LOG_LEVEL=debug
|
|
||||||
- STORJ_REPAIRER_QUEUE_ADDRESS=redis://redis:6379/?db=0
|
|
||||||
- STORJ_IDENTITY_SERVER_ADDRESS=satellite:7777
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- 7778:7777
|
|
||||||
links:
|
|
||||||
- redis
|
|
||||||
- postgres
|
|
||||||
depends_on:
|
|
||||||
- redis
|
|
||||||
- postgres
|
|
||||||
storagenode:
|
|
||||||
image: storjlabs/storagenode:${VERSION:-latest}
|
|
||||||
environment:
|
|
||||||
- SATELLITE_ADDR=satellite:7777
|
|
||||||
- STORJ_CONTACT_EXTERNAL_ADDRESS=storagenode:7777
|
|
||||||
- STORJ_OPERATOR_EMAIL=hello@storj.io
|
|
||||||
- STORJ_OPERATOR_WALLET=0x0000000000000000000000000000000000000000
|
|
||||||
- STORJ_LOG_LEVEL=debug
|
|
||||||
restart: always
|
|
||||||
links:
|
|
||||||
- satellite
|
|
||||||
gateway:
|
|
||||||
image: storjlabs/gateway:${VERSION:-latest}
|
|
||||||
command: --rs.min-threshold 1 --rs.max-threshold 1 --rs.repair-threshold 1 --rs.success-threshold 1
|
|
||||||
environment:
|
|
||||||
- API_KEY=abc123
|
|
||||||
- SATELLITE_ADDR=satellite:7777
|
|
||||||
- STORJ_LOG_LEVEL=debug
|
|
||||||
- STORJ_SERVER_ADDRESS=0.0.0.0:7777
|
|
||||||
ports:
|
|
||||||
- 7777:7777
|
|
||||||
restart: always
|
|
||||||
links:
|
|
||||||
- satellite
|
|
||||||
- storagenode
|
|
||||||
redis:
|
|
||||||
image: redis
|
|
||||||
postgres:
|
|
||||||
image: postgres:12.3
|
|
||||||
environment:
|
|
||||||
- POSTGRES_PASSWORD=postgres
|
|
||||||
- POSTGRES_USER=postgres
|
|
||||||
- POSTGRES_DB=satellite
|
|
Loading…
Reference in New Issue
Block a user