dkirillov/frostfs-aio
1
0
Fork 0
forked from TrueCloudLab/frostfs-aio
Code Pull requests Activity

[#4] Use available version of docker-compose in up target

Browse source 
Signed-off-by: Alex Vanin <a.vanin@yadro.com>
This commit is contained in:
Alexey Vanin 2023-05-18 16:39:29 +03:00
parent e7b6e3e3f9
commit bb8ad1aebc
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -15,6 +15,13 @@ FROSTFS_CORE_TAG ?= "0beb7ccf"
FROSTFS_GATES_TAG ?= "0.27.0-rc.2" FROSTFS_GATES_TAG ?= "0.27.0-rc.2"
AIO_IMAGE ?= "truecloudlab/frostfs-aio" AIO_IMAGE ?= "truecloudlab/frostfs-aio"
# Variables for compose
COMPOSE_CMD ?= docker-compose up -d
COMPOSE_V2 = "$(shell docker compose version --short | grep -q '^2' && echo true)"
ifeq ($(COMPOSE_V2), "true")
COMPOSE_CMD = docker compose up -d --wait
endif
# Variables for S3 # Variables for S3
S3_BEARER_RULES ?= "/config/bearer-rules.json" S3_BEARER_RULES ?= "/config/bearer-rules.json"
S3_GATE_PUBLIC_KEY ?= "0312fe65b101565de74eedf477afb43417ff5f795732506cfddc8e044c5a030d76" S3_GATE_PUBLIC_KEY ?= "0312fe65b101565de74eedf477afb43417ff5f795732506cfddc8e044c5a030d76"
@ -34,7 +41,7 @@ image-aio:
# Start AIO # Start AIO
up: up:
@docker-compose up --wait -d @$(COMPOSE_CMD)
# Stop AIO # Stop AIO
down: down: